diff --git a/build.xml b/build.xml
index 73e0dd64e..45d4344e8 100644
--- a/build.xml
+++ b/build.xml
@@ -243,6 +243,7 @@
         <delete dir="debian/db" />
         <delete file="debian/files" />
         <delete file="debian/build" />
+        <delete file="debian/substvars"/>
         <delete>
             <fileset dir=".." includes="i2p_*.tar.gz,i2p_*.deb,i2p_*.dsc,i2p_*.changes" />
         </delete>
diff --git a/debian/control b/debian/control
index 77a762a5d..a05d77971 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Maintainer: Hungry Hobo <HungryHobo@i2pmail.org>
 Section: net
 Priority: optional
 Homepage: http://www.i2p2.de/
-Build-Depends: sun-java6-jdk | openjdk-6-jdk | default-jdk | java-sdk, ant, fakeroot, gettext
+Build-Depends: libc6-dev (>= 2.10), sun-java6-jdk | openjdk-6-jdk | default-jdk | java-sdk, ant, fakeroot, gettext
 
 Package: i2p
 Architecture: i386 amd64
 Section: net
 Priority: optional
-Depends: libc6, sun-java6-jre | default-jre | java-runtime
+Depends: ${shlibs:Depends}, sun-java6-jre | default-jre | java-runtime
 Description: Load-balanced unspoofable packet switching network
  I2P is an anonymizing network, offering a simple layer that identity-sensitive
  applications can use to securely communicate. All data is wrapped with several
diff --git a/debian/rules b/debian/rules
index 3c4cfd3a5..e08a62c03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,6 +98,9 @@ endif
 	    sed 's|%SYSTEM_java_io_tmpdir|/tmp|g' > debian/tmp/usr/share/i2p/runplain.sh
 	chmod +x debian/tmp/usr/share/i2p/runplain.sh
 	
+	dpkg-shlibdeps debian/tmp/usr/lib/i2p/libwrapper.so
+	dpkg-shlibdeps debian/tmp/usr/lib/i2p/i2psvc
+	
 	touch debian/build
 	
 	@# changelog