diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index f426cfb..f8e76c3 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -7,7 +7,15 @@
 # clean up the upstream tarball
 unzip -x $3
 cd $DIR
+#Remove shipped jar + doc without sources
 rm -rf lib/ src/doc/pressRelease.pdf doc/pressRelease.pdf build-lib/
+mkdir build/
+# Upstream is using a patched version of bcel ...
+# https://sourceforge.net/p/findbugs/support-requests/24/
+patch -p1 < ../debian/patches/bcel-package.diff
+ant patchbcel
+rm build/bcel-5.2-src.zip
+patch -R -p1 < ../debian/patches/bcel-package.diff
 cd ..
 tar jcvf ../$TAR $DIR
 rm -rf $DIR $3
diff --git a/debian/patches/use-system-jar.patch b/debian/patches/use-system-jar.patch
index f1e5bf1..23cad2e 100644
--- a/debian/patches/use-system-jar.patch
+++ b/debian/patches/use-system-jar.patch
@@ -1,16 +1,7 @@
-Index: findbugs/build.xml
+Index: findbugs-2.0.2/build.xml
 ===================================================================
---- findbugs.orig/build.xml	2013-08-29 15:48:36.000000000 +0200
-+++ findbugs/build.xml	2013-08-29 17:02:00.000000000 +0200
-@@ -59,7 +59,7 @@
-     <property name="version.props.file" value="${build.dir}/classes/edu/umd/cs/findbugs/version.properties"/>
- 
-     <path id="findbugs.classpath">
--        <pathelement location="${jar.dir}/bcel.jar"/>
-+        <pathelement location="${sys.jar.dir}/bcel.jar"/>
-         <pathelement location="${sys.jar.dir}/dom4j.jar"/>
-         <!-- <pathelement location="${jar.dir}/AppleJavaExtensions.jar"/> -->
-         <pathelement location="${sys.jar.dir}/junit4.jar"/>
+--- findbugs-2.0.2.orig/build.xml	2013-08-29 17:52:51.000000000 +0200
++++ findbugs-2.0.2/build.xml	2013-08-29 17:54:27.000000000 +0200
 @@ -67,8 +67,9 @@
          <pathelement location="${sys.jar.dir}/asm3-commons.jar"/>
          <pathelement location="${sys.jar.dir}/asm3-tree.jar"/>
@@ -23,15 +14,6 @@
          <pathelement location="${sys.jar.dir}/commons-lang.jar"/>
          <pathelement location="${sys.jar.dir}/jcip.jar"/>
      </path>
-@@ -125,7 +126,7 @@
-     <target name="mondo" depends="jars">
-     <jar destfile="build/mondo.jar"
-         manifest="etc/MANIFEST-findbugs-mondo.MF">
--        <zipfileset src="${jar.dir}/bcel.jar"/>
-+        <zipfileset src="${sys.jar.dir}/bcel.jar"/>
-         <zipfileset src="${sys.jar.dir}/dom4j.jar"/>
-         <!-- <zipfileset src="${jar.dir}/AppleJavaExtensions.jar"/> -->
-         <zipfileset src="${sys.jar.dir}/junit4.jar"/>
 @@ -133,8 +134,8 @@
          <zipfileset src="${sys.jar.dir}/asm3-commons.jar"/>
          <zipfileset src="${sys.jar.dir}/asm3-tree.jar"/>
@@ -43,15 +25,6 @@
          <zipfileset src="${sys.jar.dir}/commons-lang.jar"/>
          <zipfileset src="${jar.dir}/findbugs.jar"/>
      </jar>
-@@ -346,7 +347,7 @@
-                 <include name="messages*.xml"/>
-             </fileset>
- 
--            <zipfileset src="${jar.dir}/bcel.jar" excludes="META-INF/**"/>
-+            <zipfileset src="${sys.jar.dir}/bcel.jar" excludes="META-INF/**"/>
- 
-             <zipfileset src="${sys.jar.dir}/asm3.jar" excludes="META-INF/**"/>
-             <zipfileset src="${sys.jar.dir}/asm3-analysis.jar" excludes="META-INF/**"/>
 @@ -357,8 +358,8 @@
  
              <zipfileset src="${sys.jar.dir}/dom4j.jar" excludes="META-INF/**"/>
@@ -63,13 +36,20 @@
              <zipfileset src="${sys.jar.dir}/commons-lang.jar" excludes="META-INF/**"/>
          </jar>
      </target>
-@@ -994,14 +995,14 @@
-     <!-- Generate jnlp jars -->
+@@ -512,7 +513,7 @@
+               jvmargs="-ea -Xmx1200m"
+               projectName="Byte code Engineering Library (BCEL)"
+               outputFile="${sampleoutput.dir}/bcel-cloud.xml" >
+-      <class location="${sys.jar.dir}/bcel.jar" />
++      <class location="${jar.dir}/bcel.jar" />
+     </findbugs>
+ -->
+ 
+@@ -995,13 +996,13 @@
      <target name="jnlp" depends="jars">
          <copy todir="${jnlp.dir}" file="${engine.jar}"/>
--        <copy todir="${jnlp.dir}" file="${jar.dir}/bcel.jar"/>
+         <copy todir="${jnlp.dir}" file="${jar.dir}/bcel.jar"/>
 -        <copy todir="${jnlp.dir}" file="${jar.dir}/jsr305.jar"/>
-+        <copy todir="${jnlp.dir}" file="${sys.jar.dir}/bcel.jar"/>
 +        <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jsr305.jar"/>
          <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3.jar"/>
          <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-commons.jar"/>