diff --git a/games-strategy/0ad/0ad-10803.ebuild b/games-strategy/0ad/0ad-10803.ebuild
index f86ba7f47..be2f90db3 100644
--- a/games-strategy/0ad/0ad-10803.ebuild
+++ b/games-strategy/0ad/0ad-10803.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz
 LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug editor nvtt pch test"
+IUSE="debug editor nvtt pch test fam"
 
 RDEPEND=">=dev-lang/spidermonkey-1.8.5
 	dev-libs/boost
@@ -31,9 +31,9 @@ RDEPEND=">=dev-lang/spidermonkey-1.8.5
 	net-libs/enet:1.3
 	net-misc/curl
 	sys-libs/zlib
-	virtual/fam
 	virtual/jpeg
 	virtual/opengl
+	fam? ( virtual/fam )
 	editor? ( x11-libs/wxGTK:2.8 )
 	nvtt? ( dev-util/nvidia-texture-tools )"
 
@@ -64,6 +64,10 @@ src_compile() {
 #		UPDATE_ARGS="${UPDATE_ARGS}  --without-pch"
 #	fi
 
+        if ! use fam ; then
+                UPDATE_ARGS="${UPDATE_ARGS}  --without-fam"
+        fi
+
 	if ! use editor ; then
 		UPDATE_ARGS="${UPDATE_ARGS} --disable-atlas"
 	fi
diff --git a/games-strategy/0ad/0ad-11339.ebuild b/games-strategy/0ad/0ad-11339.ebuild
index 490a8cee1..180f02fb5 100644
--- a/games-strategy/0ad/0ad-11339.ebuild
+++ b/games-strategy/0ad/0ad-11339.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz
 LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug editor nvtt pch test"
+IUSE="debug editor nvtt pch test fam devil"
 
 RDEPEND=">=dev-lang/spidermonkey-1.8.5
 	dev-libs/boost
@@ -31,13 +31,14 @@ RDEPEND=">=dev-lang/spidermonkey-1.8.5
 	net-libs/enet:1.3
 	net-misc/curl
 	sys-libs/zlib
-	virtual/fam
 	virtual/jpeg
 	virtual/opengl
+	fam? ( virtual/fam )
 	editor? ( x11-libs/wxGTK:2.8 )
 	nvtt? ( dev-util/nvidia-texture-tools )"
 
-DEPEND="app-arch/zip
+DEPEND="${RDEPEND}
+	app-arch/zip
 	dev-lang/nasm
 	dev-util/cmake"
 
@@ -59,6 +60,10 @@ src_compile() {
 #		UPDATE_ARGS="${UPDATE_ARGS}  --without-pch"
 #	fi
 
+	if ! use fam ; then
+		UPDATE_ARGS="${UPDATE_ARGS}  --without-fam"
+	fi
+	
 	if ! use editor ; then
 		UPDATE_ARGS="${UPDATE_ARGS} --disable-atlas"
 	fi
@@ -135,4 +140,4 @@ src_install() {
 	make_desktop_entry "${dir}"/system/${EXE_NAME} "0 A.D."
 
 	prepgamesdirs
-}
+}
\ No newline at end of file
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index c4c474257..616e404f5 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -9,6 +9,6 @@ DIST 0ad-r10803-alpha-unix-data.tar.xz 264532800 RMD160 5dcdc8c2e01c6880b4a695e5
 DIST 0ad-r11339-alpha-unix-build.tar.xz 8593664 RMD160 5e7fc6449f7bde30611880ac2575c7cd2ef021d2 SHA1 e44f8484ca7082b1a9f2761a48aa8f54c8e833d1 SHA256 1e69bc02c1af1bfbe30244467761d13e1aaff164fe583d962cc8e13faf4a56cb
 DIST 0ad-r11339-alpha-unix-data.tar.xz 294663484 RMD160 0955d2cc141f16bb1b0cbd58265e72e2b906cb7d SHA1 9178093bd71251b27bc2c85189f657a91c4e34b5 SHA256 ac4cb17478eed633e1b0c975b052706797628fac399147d6301c4001100170b4
 EBUILD 0ad-10288.ebuild 3027 RMD160 799f450762cf909d9c2005c54d41a9702bed55d8 SHA1 40362e988dd3892bb4fd505d6805eed557812d42 SHA256 47d0f9f7225ec095051eae4ae286e985b49cf287be6ab10f8547461bbae786b0
-EBUILD 0ad-10803.ebuild 3428 RMD160 20b2cca3691d8cbdeab3776a22f8b23aac3443a6 SHA1 ba93fdf438a9f95b3fcadd516e2bed7b24d1a990 SHA256 cad914cc8d9a9ccf51fd5c832b19dd747c724ceac1596de615b2201dc3a6f2f1
-EBUILD 0ad-11339.ebuild 3319 RMD160 68832feb4934b3f786fc909fb51082803113ff57 SHA1 2ea03458674ee7c754a908cc5b9f34c673f8b6a8 SHA256 5c6669771df2080d68ab89f12ea1026c93173e3f7e312443ad60947447d7d8a9
+EBUILD 0ad-10803.ebuild 3541 RMD160 2285f8928e8223b9567d5060ffb473696fe17bc1 SHA1 1c52603b967ee969d24faa1565053025423f3fa7 SHA256 c8d2c30c7f2ef2e6eee4f8027bd93a30f26666121892053b41ab6432fafc5049
+EBUILD 0ad-11339.ebuild 3422 RMD160 f08836e1e9bd4ab930f65e5c03f405f57775498c SHA1 c77fe495a3a2f67fb21cf6bb5b1ab863014291fc SHA256 072d94e6a6104c54818847e0546f5c0cdd7dd623e9f5e7f86d1097f9a0fa8978
 EBUILD 0ad-9786-r1.ebuild 3134 RMD160 717bb680456d44a0d3728c80917f022c2f01073c SHA1 91c6a7e943b1f7f899bec7709111e5e8a28a4c00 SHA256 8f6081574a3a31e271c884eea4c877b05917d70427b6ad0584acec4f506119ec