diff --git a/sys-devel/gettext/gettext-0.18.1.1-dev.bep b/sys-devel/gettext/gettext-0.18.1.1-dev.bep
index 415149312..988666d36 100644
--- a/sys-devel/gettext/gettext-0.18.1.1-dev.bep
+++ b/sys-devel/gettext/gettext-0.18.1.1-dev.bep
@@ -4,9 +4,20 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz"
 CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89"
 REVISION="1"
 STATUS_HAIKU="broken"
-DEPEND=""
+DEPEND="dev-libs/gnulib = 9999"
 BUILD {
 	cd gettext-0.18.1.1
+
+	if [ ! -e `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999 ] ; then
+		echo "gnulib not found, so updating it now..."
+		haikuporter -i gnulib
+	fi
+	echo "Copying gnulib to gettext work directory..."
+	cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/binary* gettext-tools/gnulib-lib/
+	cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/fseek* gettext-tools/gnulib-lib/
+	cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/iswblank* gettext-tools/gnulib-lib/
+	cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/fcntl* gettext-tools/gnulib-lib/
+
 	cp -a build-aux gettext-tools/
 	cd gettext-tools
 	echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac
@@ -14,7 +25,7 @@ BUILD {
 	cd ..
 	libtoolize --force --copy --install
 	sed -i 's/AC_INIT/AC_INIT([gettext],[0.18.1.1])/' configure.ac
-	./autogen.sh --quick
+	./autogen.sh --quick --skip-gnulib
 	cd gettext-runtime
 	sed -i 's/AC_INIT/AC_INIT([gettext-runtime],[0.18.1.1])/' configure.ac
 	sed -i 's/gl_INIT_PACKAGE/dnl gl_INIT_PACKAGE was here/' configure.ac
@@ -26,24 +37,18 @@ BUILD {
 	libtoolize --force --copy --install
 	autoconf -Wnone
 	export EXTRA_CONF="--disable-java"
-#	export LDFLAGS="-lnetwork -liconv"
-	cd ../gettext-tools
+	cd ../
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-	cd ../gettext-runtime
-		./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
+    make
 }
 
 INSTALL {
-	cd gettext-0.18.1.1.gettext-tools
-	make install
-	cd ../gettext-0.18.1.1/gettext-runtime
+	cd gettext-0.18.1.1
 	make install
 }
 
 TEST {
-	cd gettext-0.18.1.1.gettext-tools
+	cd gettext-0.18.1.1/gettext-tools
 	make check
 	cd ../gettext-0.18.1.1/gettext-runtime
 	make check