diff --git a/haiku-apps/paladin/paladin-1.3.bep b/haiku-apps/paladin/paladin-1.3.bep
index 54cb48206..db0fd2a99 100644
--- a/haiku-apps/paladin/paladin-1.3.bep
+++ b/haiku-apps/paladin/paladin-1.3.bep
@@ -3,30 +3,36 @@ HOMEPAGE="http://paladin.sourceforge.net"
 SRC_URI="http://sourceforge.net/projects/paladin/files/Paladin-1.3.src.zip/download"
 REVISION="1"
 STATUS_HAIKU="stable"
-DEPEND="dev-libs/libpcre >= 8.00"
+DEPEND="dev-libs/libpcre >= 8.02"
 CHECKSUM_MD5="36ad2e8dfa71218b37a469311c09c408"
 BUILD {
 	cd Paladin
 	chmod 755 buildhaikugcc2.sh
 	chmod 755 buildhaikugcc4.sh
 	if [ -n "$(setgcc | grep '2')" ]; then
-    	./buildhaikugcc2.sh
-    else
-    	./buildhaikugcc4.sh
-    fi
+    		./buildhaikugcc2.sh
+		cd ../SymbolFinder
+		../Paladin/Paladin -r -d SymbolFinder.pld
+	else
+		./buildhaikugcc4.sh
+		cd ../SymbolFinder
+		make		
+	fi
 	cd ../PalEdit
 	jam
-	cd ../SymbolFinder
-	../Paladin/Paladin -b SymbolFinder.pld
 }
 
 INSTALL {
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin
 	cp -f Paladin/Paladin ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
-#	cp -f "Paladin/WHAT'S NEW" Paladin ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
+	cp -f Paladin/WHAT* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
 	cp -f Paladin/README ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
-	cp -f -r PalEdit/generated/distro ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
-	cp -f SymbolFinder/SymbolFinder ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
+	cp -f -r PalEdit/generated/distro/* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
+	if [ -n "$(setgcc | grep '2')" ]; then
+		cp -f SymbolFinder/SymbolFinder ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
+	else
+		cp -f SymbolFinder/objects.x86-gcc4-release/SymbolFinder ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
+	fi
 }
 LICENSE="MIT"
 COPYRIGHT="2008-2010 Jon Yoder"
diff --git a/haiku-apps/paladin/patches/paladin-1.3.patch b/haiku-apps/paladin/patches/paladin-1.3.patch
index e7958c81c..6e818346d 100644
--- a/haiku-apps/paladin/patches/paladin-1.3.patch
+++ b/haiku-apps/paladin/patches/paladin-1.3.patch
@@ -83,3 +83,34 @@ diff -urN PalEdit/Jamrules PalEdit-jam/Jamrules
 +	cp -a $(COMMON_FOLDER)/lib/libpcre*.so $(DISTRO_DIR)/lib/ ;
 +}
 +
+diff -urN SymbolFinder/Makefile SymbolFinder-gcc4/Makefile
+--- SymbolFinder/Makefile	1970-01-01 00:00:00.000000000 +0000
++++ SymbolFinder-gcc4/Makefile	2010-09-03 15:40:49.521666560 +0000
+@@ -0,0 +1,27 @@
++NAME= SymbolFinder
++TYPE= APP
++SRCS= App.cpp DPath.cpp DWindow.cpp MainWindow.cpp
++RSRCS=
++LIBS= /boot/develop/lib/x86/libroot.so /boot/develop/lib/x86/libbe.so /boot/system/lib/gcc4/libstdc++.so /boot/develop/lib/x86/libsupc++.so /boot/develop/lib/x86/libstdc++.so
++LIBPATHS=
++SYSTEM_INCLUDE_PATHS= /boot/develop/headers/be /boot/develop/headers/cpp /boot/develop/headers/posix /boot/home/config/include
++LOCAL_INCLUDE_PATHS=
++OPTIMIZE=FULL
++#	specify any preprocessor symbols to be defined.  The symbols will not
++#	have their values set automatically; you must supply the value (if any)
++#	to use.  For example, setting DEFINES to "DEBUG=1" will cause the
++#	compiler option "-DDEBUG=1" to be used.  Setting DEFINES to "DEBUG"
++#	would pass "-DDEBUG" on the compiler's command line.
++DEFINES=
++#	specify special warning levels
++#	if unspecified default warnings will be used
++#	NONE = supress all warnings
++#	ALL = enable all warnings
++WARNINGS =
++# Build with debugging symbols if set to TRUE
++SYMBOLS=
++COMPILER_FLAGS=
++LINKER_FLAGS=
++
++## include the makefile-engine
++include $(BUILDHOME)/etc/makefile-engine