diff --git a/debian/changelog b/debian/changelog
index 655d957e2102193d4a5f40a55c8a2d4778455b1d..bf02d9fb02c5a4131f0035f91ce4634c46322bb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+i2p (0.8.7-5) stable; urgency=low
+
+  * Depend on default-jre-headless | java5-runtime-headless |
+    java6-runtime-headless instead of the non-headless versions. Sure the
+    -headless packages fulfilled the dependency, but this way it should pull in
+    the headless package by default.
+  * Remove unused lock from core/java/src/net/i2p/crypto/ElGamalEngine.java to
+    fix lock-ups on arm/ppc CPUs
+
+ -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 01 Aug 2011 17:51:14 +0000
+
 i2p (0.8.7-4) stable; urgency=low
 
   * Change to allow jbigi to be built on non-x86
diff --git a/debian/control b/debian/control
index 84ba0251380e58b861bd246c9e8d2bae0fbea0c1..14c082c8a203590fddfe5ea892bb947c6b94a062 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Package: i2p
 Architecture: all
 Section: net
 Priority: optional
-Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, default-jre | java5-runtime | java6-runtime,
+Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  adduser, 
  i2p-router (>= 0.8.6-5),
  libjbigi-jni (>= ${source:Version}),
@@ -65,12 +65,13 @@ Package: i2p-router
 Architecture: all
 Section: net
 Priority: optional
-Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, default-jre | java5-runtime | java6-runtime
+Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, default-jre-headless | java5-runtime-headless | java6-runtime-headless
 Replaces: i2p ( << 0.8.6-5)
 Breaks: i2p (<< 0.8.6-5)
 Recommends: libjbigi-jni (>= ${source:Version}), libjbigi-jni (<< ${source:Version}.1~)
 Suggests: tor,
  i2p-messenger,
+ i2phex,
  i2p-tahoe-lafs,
  imule,
  i2pfox,