diff --git a/media-libs/ftgl/ftgl-2.1.3.bep b/media-libs/ftgl/ftgl-2.1.3.bep
index 4428a9fd4..61523a430 100644
--- a/media-libs/ftgl/ftgl-2.1.3.bep
+++ b/media-libs/ftgl/ftgl-2.1.3.bep
@@ -27,5 +27,5 @@ INSTALL {
 }
 
 LICENSE="MIT"
-COPYRIGHT="2001-2004 Unicode, Inc."
-COPYRIGHT="2001-2009 Henry Maddocks"
+COPYRIGHT="2001-2004 Unicode, Inc.
+	2001-2009 Henry Maddocks"
diff --git a/net-misc/wput/wput-0.6.1-haiku.diff b/net-misc/wput/patches/wput-0.6.1.patch
similarity index 100%
rename from net-misc/wput/wput-0.6.1-haiku.diff
rename to net-misc/wput/patches/wput-0.6.1.patch
diff --git a/net-misc/wput/wput-0.6.1.bep b/net-misc/wput/wput-0.6.1.bep
index 40eb96353..2bf494ee7 100644
--- a/net-misc/wput/wput-0.6.1.bep
+++ b/net-misc/wput/wput-0.6.1.bep
@@ -7,13 +7,12 @@ STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
 	cd wput-0.6.1
-	cp /boot/home/config/share/libtool/config.guess .
-	cp /boot/home/config/share/libtool/config.sub .
-	libtoolize --force --copy
-	aclocal
-	automake --add-missing
-	autoconf
-	./configure --prefix=/boot/common --enable-shared
+	echo 'LT_INIT' >> configure.in
+	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in
+	libtoolize --force --copy --install
+	aclocal -I m4 --warnings=none --force
+	autoconf --warnings=none
+	./configure --prefix=/boot/common --enable-shared --disable-nls
 	make 
 }
 
@@ -21,3 +20,6 @@ INSTALL {
 	cd wput-0.6.1
 	make install
 }
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2002-2006 Hagen Fritsch"