diff --git a/debian/changelog b/debian/changelog
index cd8a738..2ea9bf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+findbugs (2.0.3+repack-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed the compilation failure with BCEL 6.0 RC3 (Closes: #796430)
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 10 Dec 2015 15:09:26 +0100
+
 findbugs (2.0.3+repack-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0009-bcel-compatibility.patch b/debian/patches/0009-bcel-compatibility.patch
new file mode 100644
index 0000000..2e2dea1
--- /dev/null
+++ b/debian/patches/0009-bcel-compatibility.patch
@@ -0,0 +1,43 @@
+--- a/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
++++ b/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
+@@ -56,7 +56,7 @@
+ import org.apache.bcel.classfile.StackMapEntry;
+ import org.apache.bcel.classfile.Synthetic;
+ import org.apache.bcel.classfile.Unknown;
+-import org.apache.bcel.classfile.Visitor;
++import org.apache.bcel.classfile.EmptyVisitor;
+ 
+ /**
+  * Fixedup of from org.apache.bcel.classfile.Visitor
+@@ -64,7 +64,7 @@
+  * @author <A HREF="http://www.cs.umd.edu/~pugh">William Pugh</A>
+  * @version 980818
+  */
+-public abstract class BetterVisitor implements Visitor {
++public abstract class BetterVisitor extends EmptyVisitor {
+ 
+     /**
+      * clone() is overridden to change access control from protected to public.
+--- a/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
++++ b/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
+@@ -265,6 +265,9 @@
+     public void visitStackConsumer(StackConsumer obj) {
+     }
+ 
++    public void visitNameSignatureInstruction(NameSignatureInstruction obj) {
++    }
++
+     /*
+      * ----------------------------------------------------------------------
+      * General instruction handlers
+@@ -1084,6 +1087,10 @@
+     public void visitFADD(FADD obj) {
+         handleNormalInstruction(obj);
+     }
++
++    public void visitINVOKEDYNAMIC(INVOKEDYNAMIC obj) {
++        handleNormalInstruction(obj);
++    }
+ }
+ 
+ // vim:ts=4
diff --git a/debian/patches/series b/debian/patches/series
index 6f9f017..9a1273e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-FixLibraryPathInJavaDoc.patch
 0007-FixManifest.patch
 0008-fix-docbook-ref.patch
+0009-bcel-compatibility.patch