diff --git a/geant/files/geant-4.9.1_p01-configure.patch b/geant/files/geant-4.9.1_p01-configure.patch
index 55c925d..cbe7d96 100644
--- a/geant/files/geant-4.9.1_p01-configure.patch
+++ b/geant/files/geant-4.9.1_p01-configure.patch
@@ -1,6 +1,8 @@
---- Configure.orig	2007-11-28 13:49:23.000000000 +0000
-+++ Configure	2008-04-07 18:45:41.317949330 +0000
-@@ -579,16 +579,17 @@
+diff --git a/Configure b/Configure
+index c233600..9ca0371 100755
+--- a/Configure
++++ b/Configure
+@@ -579,16 +579,17 @@ EOM
  	;;
  esac
  
@@ -28,7 +30,7 @@
  
  exec 4>&1
  case "$silent" in
-@@ -982,7 +983,7 @@
+@@ -982,7 +983,7 @@ EOF
  : general instructions
  needman=true
  firsttime=true
@@ -37,7 +39,7 @@
  case "$user" in
  '') user=`whoami 2>&1`;;
  esac
-@@ -1315,7 +1316,6 @@
+@@ -1315,7 +1316,6 @@ case "$config_sh" in
  '')
  myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1`
  
@@ -45,7 +47,7 @@
  myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \
  	./tr '[A-Z]' '[a-z]' | tr '\012' ' '`
  newmyuname="$myuname"
-@@ -1911,7 +1911,7 @@
+@@ -1911,7 +1911,7 @@ fi
  	
  	. $src/.config/bin/$g4system/move.sh
  
@@ -54,7 +56,7 @@
  
  	fi #end of cppflags
  
-@@ -2119,7 +2119,7 @@
+@@ -2119,7 +2119,7 @@ EOM
  cp -i $src/.config/bin/$g4system/env.csh .
  cp -i $src/.config/bin/$g4system/env.sh  .
  
@@ -63,7 +65,7 @@
  	fi #end of -lib or user
  else #there is no env.sh
  
-@@ -2217,7 +2217,7 @@
+@@ -2217,7 +2217,7 @@ done
  
  : who configured the system
  cf_time=`$date 2>&1`
@@ -72,7 +74,7 @@
  case "$cf_by" in
  "")
  	cf_by=`(whoami) 2>/dev/null`
-@@ -4200,9 +4200,9 @@
+@@ -4200,9 +4200,9 @@ fi
  if test "X$g4osname" = "XLinux" ; then
  g4vis_xmflags=" -I$g4vis_xmhome/include "
  	if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then
@@ -84,7 +86,7 @@
  	fi
  fi
  
-@@ -4908,9 +4908,9 @@
+@@ -4908,9 +4908,9 @@ fi
  if test "X$g4osname" = "XLinux" ; then
  g4vis_xmflags=" -I$g4vis_xmhome/include "
  	if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then
@@ -96,7 +98,7 @@
  	fi
  fi
  
-@@ -6123,7 +6123,7 @@
+@@ -6123,7 +6123,7 @@ esac
  
  echo ""
  
@@ -105,7 +107,7 @@
  				case $g4_gmake_version in
  				GNU*) 
  				g4_gmake=y				
-@@ -6133,7 +6133,7 @@
+@@ -6133,7 +6133,7 @@ echo ""
  				;;
  				esac				
  
@@ -114,3 +116,21 @@
  				case $g4_make_version in
  				GNU*) 
  				g4_make=y				
+@@ -6145,7 +6145,7 @@ echo ""
+ 
+ if  [ $g4_gmake = y ] ; then
+ 
+-g4make=gmake
++g4make="gmake "`echo $MAKEOPTS`
+ 
+ g4message=`cat << EOM
+ 
+@@ -6159,7 +6159,7 @@ fi
+ 
+ if [ $g4_gmake = n ] && [ $g4_make = y ] ; then
+ 
+-g4make=make
++g4make="make "`echo $MAKEOPTS`
+ 
+ g4message=`cat << EOM
+ 
diff --git a/geant/files/geant-4.9.1_p01-no-source.patch b/geant/files/geant-4.9.1_p01-no-source.patch
index 8ca619e..7859cae 100644
--- a/geant/files/geant-4.9.1_p01-no-source.patch
+++ b/geant/files/geant-4.9.1_p01-no-source.patch
@@ -1,6 +1,8 @@
---- config/scripts/move.sh.SH.orig	2008-04-08 16:08:16.817366051 +0000
-+++ config/scripts/move.sh.SH	2008-04-08 19:05:44.332687325 +0000
-@@ -445,33 +445,8 @@
+diff --git a/config/scripts/move.sh.SH b/config/scripts/move.sh.SH
+index 5f633cc..b938dc7 100644
+--- a/config/scripts/move.sh.SH
++++ b/config/scripts/move.sh.SH
+@@ -445,39 +445,13 @@ echo ""
  cd $g4install
  #echo `pwd`
  
@@ -36,3 +38,9 @@
  echo ""
  echo "Installing headers..."
  echo ""
+ cd $g4install/source
+ $g4make includes dependencies=""
+-fi
+ 
+ # Move libraries
+ if [ X$g4install != X$g4final_install ] ; then
diff --git a/geant/geant-4.9.1_p01.ebuild b/geant/geant-4.9.1_p01.ebuild
index 109eddb..909be4e 100644
--- a/geant/geant-4.9.1_p01.ebuild
+++ b/geant/geant-4.9.1_p01.ebuild
@@ -25,7 +25,7 @@ done
 LICENSE="geant4"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
-IUSE="athena +data dawn debug examples gdml geant3 minimal +motif
+IUSE="athena +data dawn debug examples gdml geant3 minimal motif
 	+opengl openinventor +raytracerx +vrml zlib"
 
 DEPEND="sci-physics/clhep
@@ -92,13 +92,19 @@ g4w_use() {
 }
 
 src_compile() {
-	GEANT4_DATA_DIR=/usr/share/${PN}
+	GEANT4_DIR=/usr/share/${PN}
 	# The Configure shell script saves its options
 	# in .config/bin/*/config.sh
 
 	local myconf="$(g4vis_use opengl openglx)"
 	use opengl && myconf="${glconf} $(g4vis_use motif openglxm)"
-	use data && myconf="${myconf} -D g4data=${GEANT_DATA_DIR}"
+	DATA="${GEANT4_DIR}/data"
+	use data && myconf="${myconf}
+	-D g4levelgammadata=${DATA}/PhotonEvaporation2.0
+	-D g4radioactivedata=${DATA}/RadioactiveDecay3.2
+	-D g4ledata=${DATA}/G4EMLOW5.1
+	-D g4neutronhpcrosssections=${DATA}/G4NDL3.12
+	-D g4abladata=${DATA}/G4ABLA3.0"
 
 	 # switch to see compiling flags
 	export CPPVERBOSE=y
@@ -142,13 +148,13 @@ src_compile() {
 		-D g4lib_build_static=n \
 		|| die "Building shared geant failed"
 
-	rm -rf tmp
-
-	./Configure \
-		-deO -build \
-		-D g4lib_build_shared=n \
-		-D g4lib_build_static=y \
-		|| die "Building shared geant failed"
+	# rm -rf tmp
+	#
+	#	./Configure \
+	#		-deO -build \
+	#		-D g4lib_build_shared=n \
+	#		-D g4lib_build_static=y \
+	#		|| die "Building shared geant failed"
 }
 
 src_install() {
@@ -159,18 +165,22 @@ src_install() {
 	./Configure \
 		|| die "Final install failed"
 
-	insinto ${GEANT4_DATA_DIR}
+	insinto ${GEANT4_DIR}
 	sed -i \
-		-e "s:${S}:${GEANT4_DATA_DIR}:g" \
+		-e "s:${S}:${GEANT4_DIR}:g" \
 		-e "s:${D}:/:g" \
 		env.*sh
 	doins env.*sh || die "failed installing shell scripts"
 	doins -r config
+	insinto "${GEANT4_DIR}/data"
 	if use data; then
 		cd "${WORKDIR}"
-		for d in ${GEANT4_DATA}; do
-			doins -r ${d/.} || die "installing data ${d} failed"
+		# give an explicit list of data dirs since the archive names don't
+		# always match the content
+		for d in "G4NDL3.12 G4EMLOW5.1 RadioactiveDecay3.2 PhotonEvaporation2.0 G4ABLA3.0"; do
+			doins -r ${d} || die "installing data ${d} failed"
 		done
+		cd "${S}"
 	fi
 
 	# doc and examples
@@ -188,9 +198,9 @@ src_install() {
 
 pkg_postinst() {
 	elog "You can set the Geant4 environment variables"
-	elog "from ${ROOT}${GEANT4_DATA_DIR} shell scripts."
+	elog "from ${ROOT}${GEANT4_DIR} shell scripts."
 	elog "Ex: for bash"
-	elog "     source ${ROOT}${GEANT4_DATA_DIR}/env.sh"
+	elog "     source ${ROOT}${GEANT4_DIR}/env.sh"
 	elog
 	elog "Help us to improve the ebuild and dependencies in"
 	elog "http://bugs.gentoo.org/show_bug.cgi?id=212221"