diff --git a/haiku-apps/bepdf/bepdf-1.1.1b2-532.bep b/haiku-apps/bepdf/bepdf-1.1.1b2-532.bep
index 9bc9e880b..cb215662e 100644
--- a/haiku-apps/bepdf/bepdf-1.1.1b2-532.bep
+++ b/haiku-apps/bepdf/bepdf-1.1.1b2-532.bep
@@ -1,18 +1,22 @@
 DESCRIPTION="BePDF is a PDF viewer for the BeOS, Haiku & Zeta" 
 HOMEPAGE="http://bepdf.sourceforge.net/" 
-SRC_URI="svn+http://bepdf.svn.sourceforge.net/svnroot/bepdf#532"
+SRC_URI="svn+http://bepdf.svn.sourceforge.net/svnroot/bepdf/trunk#532"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""	
 		
 BUILD {
+	export BEPDF_BUILD_GCC=`setgcc | cut -d/ -f2`
 	cd bepdf-1.1.1b2-532
-	make
+	./build.sh package
 }
 
 INSTALL {
 	cd bepdf-1.1.1b2-532
-	make
+
+	# TODO:...
+	echo "Implement me ..."
+	exit 1
 }
 
 COPYRIGHT="1997 Benoit Triquet
diff --git a/haiku-apps/bepdf/patches/bepdf-1.1.1b2-532.patch b/haiku-apps/bepdf/patches/bepdf-1.1.1b2-532.patch
new file mode 100644
index 000000000..9d1c4df7b
--- /dev/null
+++ b/haiku-apps/bepdf/patches/bepdf-1.1.1b2-532.patch
@@ -0,0 +1,21 @@
+Index: bepdf-1.1.1b2-532/bepdf/Jamfile
+===================================================================
+--- bepdf-1.1.1b2-532/bepdf/Jamfile	(revision 532)
++++ bepdf-1.1.1b2-532/bepdf/Jamfile	(working copy)
+@@ -96,10 +96,14 @@
+ #		naming scheme you need to specify the path to the library
+ #		and it's name
+ #		library: my_lib.a entry: my_lib.a or path/my_lib.a
+-LIBS = 
++LIBS = stdc++.r4 ;
++if $(BEPDF_BUILD_GCC) = gcc4 {
++	# Use the standard libstdc++ name when building with gcc 4.
++	LIBS = stdc++ ;
++}
++LIBS +=
+ # BeOS
+ be
+-stdc++.r4
+ textencoding
+ tracker
+ translation