diff --git a/usr/portage/games-simulation/openttd/openttd-0.7.5.ebuild b/games-simulation/openttd/openttd-1.0.0.ebuild
index 551d591..dece33c 100644
--- a/usr/portage/games-simulation/openttd/openttd-0.7.5.ebuild
+++ b/games-simulation/openttd/openttd-1.0.0.ebuild
@@ -1,18 +1,22 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.7.5.ebuild,v 1.4 2010/02/10 00:04:57 josejx Exp $
+# $Header: $
 
-EAPI=2
+EAPI=3
 inherit eutils games
 
+MY_PV=${PV/_rc/-RC}
+MY_P=${PN}-${MY_PV}
+
 DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
 HOMEPAGE="http://www.openttd.org/"
-SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.bz2"
+SRC_URI="http://binaries.openttd.org/releases/${MY_PV}/${MY_P}-source.tar.bz2"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86"
-IUSE="alsa debug dedicated iconv icu +png +truetype zlib"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa debug dedicated iconv icu lzo +openmedia +png +truetype zlib"
 RESTRICT="test"
 
 DEPEND="
@@ -25,6 +29,7 @@ DEPEND="
 			sys-libs/zlib
 		)
 	)
+	lzo? ( dev-libs/lzo:2 )
 	iconv? ( virtual/libiconv )
 	png? ( media-libs/libpng )
 	zlib? ( sys-libs/zlib )"
@@ -32,6 +37,12 @@ RDEPEND="${DEPEND}
 	!dedicated? (
 		alsa? ( media-sound/alsa-utils )
 	)"
+PDEPEND="
+	openmedia? (
+		games-misc/opengfx
+		games-misc/opensfx
+		games-misc/openmsx
+	)"
 
 src_configure() {
 	local myopts
@@ -53,6 +64,12 @@ src_configure() {
 		myopts="${myopts} --without-zlib"
 	fi
 
+	if use lzo ; then
+		myopts="${myopts} --with-liblzo2"
+	else
+		myopts="${myopts} --without-liblzo2"
+	fi
+
 	# there is an allegro interface available as well as sdl, but
 	# the configure for it looks broken so the sdl interface is
 	# always built instead.
@@ -61,7 +78,7 @@ src_configure() {
 	# configure is a hand-written bash-script, so econf will not work
 	./configure \
 		--disable-strip \
-		--prefix-dir=/ \
+		--prefix-dir="${EPREFIX}" \
 		--binary-dir="${GAMES_BINDIR}" \
 		--data-dir="${GAMES_DATADIR}/${PN}" \
 		--install-dir="${D}" \
@@ -91,18 +108,32 @@ src_install() {
 pkg_postinst() {
 	games_pkg_postinst
 
-	elog
-	elog "In order to play, you must copy the following 6 files from "
-	elog "a version of TTD to ${GAMES_DATADIR}/${PN}/data/."
-	elog
-	elog "From the WINDOWS version you need: "
-	elog "  sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
-	elog "OR from the DOS version you need: "
-	elog "  SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
-	elog
-	elog "File names are case sensitive so make sure they are "
-	elog "correct for whichever version you have."
-	elog
+	if ! use openmedia ; then
+		elog
+		elog "OpenTTD was compiled without openmedia USE flags."
+		elog
+		elog "In order to play, you must either install games-misc/opengfx"
+		elog "as well as games-misc/opensfx or copy the following 6 files"
+		elog "from a version of Transport Tycoon Deluxe (windows or DOS)"
+		elog "to ~/.openttd/data/ or ${GAMES_DATADIR}/${PN}/data/."
+		elog
+		elog "From the WINDOWS version you need: "
+		elog "  sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
+		elog "OR from the DOS version you need: "
+		elog "  SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
+		elog
+		elog "File names are case sensitive so make sure they are "
+		elog "correct for whichever version you have."
+		elog
+	fi
+
+	if ! use lzo ; then
+		elog "OpenTTD was compiled without lzo2 support."
+		elog "While lzo2 is not required, disabling it does mean that"
+		elog "loading old savegames/scenarios from ancient versions (~0.2)"
+		elog "will be disabled"
+		elog
+	fi
 
 	if use dedicated ; then
 		ewarn "Warning: The init script will kill all running openttd"
@@ -112,8 +143,15 @@ pkg_postinst() {
 			elog "You have emerged with 'aplaymidi' for playing MIDI."
 			elog "You have to set the environment variable ALSA_OUTPUT_PORTS."
 			elog "Available ports can be listed by using 'aplaymidi -l'."
+			if ! use openmedia ; then
+				elog "You have disabled the openmedia use flag, in-game music"
+				elog "will be unavailable unless you install games-misc/openmsx"
+				elog "or install a music set in ~/.openttd/gm or use the in-game"
+				elog "download functionality to get a music set"
+			fi
 		else
 			elog "alsa not in USE so music will not be played during the game."
+
 		fi
 	fi
 }