diff -ur findbugs-1.3.9-ORIGINAL/etc/script.properties findbugs-1.3.9/etc/script.properties
--- findbugs-1.3.9-ORIGINAL/etc/script.properties	2012-07-28 22:30:00.767724162 +0100
+++ findbugs-1.3.9/etc/script.properties	2012-07-28 23:05:37.476928168 +0100
@@ -94,10 +94,15 @@
 	fb_javacmd=\${fb_javacmd:-"java"}\n\
 	fb_maxheap=\${fb_maxheap:-"-Xmx584m"}\n\
 	fb_appjar=\${fb_appjar:-"/usr/share/java/findbugs.jar"}\n\
+	\n\
+	fb_classpath=\$(build-classpath findbugs findbugs-bcel dom4j jaxen \\\n\
+	\tobjectweb-asm/asm objectweb-asm/asm-tree objectweb-asm/asm-commons \\\n\
+	\tjsr-305 jFormatString apache-commons-lang)\n\
+	\n\
 	set -f\n\
 	#echo command: \\\n\
 	exec "$fb_javacmd" \\\n\
-	\t-classpath "$fb_appjar$fb_pathsep$CLASSPATH" \\\n\
+	\t-classpath "$fb_classpath" \\\n\
 	\t-Dfindbugs.home="$findbugs_home"\\\n\
 	\t$fb_maxheap $fb_jvmargs $fb_mainclass \${@:+"$@"} $fb_appargs
 
diff -ur findbugs-1.3.9-ORIGINAL/src/scripts/standard/findbugs2 findbugs-1.3.9/src/scripts/standard/findbugs2
--- findbugs-1.3.9-ORIGINAL/src/scripts/standard/findbugs2	2012-07-28 22:30:00.768724163 +0100
+++ findbugs-1.3.9/src/scripts/standard/findbugs2	2012-07-28 23:35:01.750499860 +0100
@@ -109,13 +109,19 @@
 		-Dapple.laf.useScreenMenuBar=true"
 fi
 
+fb_classpath=$(build-classpath findbugs findbugs-bcel dom4j jaxen \
+	objectweb-asm/asm objectweb-asm/asm-tree objectweb-asm/asm-commons \
+	jsr-305 jFormatString apache-commons-lang)
+
+fb_mainclass=edu.umd.cs.findbugs.LaunchAppropriateUI
+
 #
 # Launch JVM
 #
 exec "$fb_javacmd" \
-	-classpath "$fb_appjar$fb_pathsep$CLASSPATH" \
+	-classpath "$fb_classpath" \
 	-Dfindbugs.home="$findbugs_home" \
 	$jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props \
 	-Dfindbugs.launchUI=$fb_launchui \
-	-jar /usr/share/java/findbugs.jar \
+	$fb_mainclass \
 	${@:+"$@"}