diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index d3a089ff4d85..b5fec7ce1f04 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -337,6 +337,22 @@ ORDER BY UPPER(C.name)
   </query>
 </write-mode>
 
+<write-mode name="cleanup_package_predepends">
+    <query params="pid">
+        DELETE from
+        rhnPackagePreDepends
+        where package_id = :pid
+    </query>
+</write-mode>
+
+<write-mode name="cleanup_package_breaks">
+    <query params="pid">
+        DELETE from
+        rhnPackageBreaks
+        where package_id = :pid
+    </query>
+</write-mode>
+
 <write-mode name="cleanup_package_caps">
   <query params="pid">
 DELETE FROM
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageBreaks.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageBreaks.java
index a3ce0755ade9..db2fea80e312 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageBreaks.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageBreaks.java
@@ -20,7 +20,7 @@
 import javax.persistence.Table;
 
 /**
- * PackagePreDepends
+ * PackageBreaks
  */
 @Entity
 @Table(name = "rhnPackageBreaks")
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSupplements.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSupplements.java
index eae10ac53e5d..f89c9df4320e 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSupplements.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSupplements.java
@@ -20,7 +20,7 @@
 import javax.persistence.Table;
 
 /**
- * PackagePreDepends
+ * PackageSupplements
  */
 @Entity
 @Table(name = "rhnPackageSupplements")
diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
index 4295d24a5c3b..9eaf13c2c296 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
@@ -93,7 +93,7 @@ public class PackageManager extends BaseManager {
 
     private static final String[]
         CLEANUP_QUERIES = {"requires", "provides", "conflicts", "obsoletes",
-            "recommends", "suggests", "supplements", "enhances",
+            "recommends", "suggests", "supplements", "enhances", "predepends", "breaks",
             "channels", "files", "caps", "changelogs"};
 
     /**
diff --git a/java/spacewalk-java.changes.mc.Manager-4.3-fix-removing-deb-packages b/java/spacewalk-java.changes.mc.Manager-4.3-fix-removing-deb-packages
new file mode 100644
index 000000000000..a7c2b8a1ebb6
--- /dev/null
+++ b/java/spacewalk-java.changes.mc.Manager-4.3-fix-removing-deb-packages
@@ -0,0 +1 @@
+- fix exception when removing a debian package (bsc#1216781)