diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index 83c0f514a..ec0e5e7e8 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -16,6 +16,7 @@
             <!-- Depend on classes instead of jars where available -->
             <classpath>
                 <pathelement location="../../../core/java/build/obj" />
+                <pathelement location="../../../core/java/build/gnu-getopt.jar" />
                 <pathelement location="../../ministreaming/java/build/obj" />
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
                 <!-- jsp-api.jar only present for debian builds -->
@@ -43,6 +44,8 @@
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
                 <pathelement location="../../../core/java/build/i2p.jar" />
+                <!-- gnu-getopt.jar only present for debian builds -->
+                <pathelement location="../../../core/java/build/gnu-getopt.jar" />
                 <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
                 <!-- jsp-api.jar only present for debian builds -->
diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index e0cc3dc80..9c86a7ae1 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -16,6 +16,7 @@
             <!-- Depend on classes instead of jars where available -->
             <classpath>
                 <pathelement location="../../../core/java/build/obj" />
+                <pathelement location="../../../core/java/build/gnu-getopt.jar" />
                 <pathelement location="../../ministreaming/java/build/obj" />
             </classpath>
         </depend>
@@ -38,7 +39,7 @@
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             destdir="./build/obj" 
             includeAntRuntime="false"
-            classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
+            classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
     </target>
diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml
index 9ecc58b8c..04e8d6932 100644
--- a/apps/sam/java/build.xml
+++ b/apps/sam/java/build.xml
@@ -16,6 +16,7 @@
             <!-- Depend on classes instead of jars where available -->
             <classpath>
                 <pathelement location="../../../core/java/build/obj" />
+                <pathelement location="../../../core/java/build/gnu-getopt.jar" />
                 <pathelement location="../../ministreaming/java/build/obj" />
             </classpath>
         </depend>
@@ -35,7 +36,7 @@
             debug="true" deprecation="on" source="1.7" target="1.7" 
             includeAntRuntime="false"
             destdir="./build/obj" 
-            classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
+            classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" >
             <compilerarg line="${javac.compilerargs7}" />
         </javac>
     </target>
diff --git a/build.xml b/build.xml
index 40c601f7e..d34c55698 100644
--- a/build.xml
+++ b/build.xml
@@ -1290,6 +1290,7 @@
         <java classname="net.i2p.router.networkdb.kademlia.BundleRouterInfos" fork="true" failonerror="true">
             <classpath>
                 <pathelement location="build/i2p.jar" />
+                <pathelement location="core/java/build/gnu-getopt.jar" />
                 <pathelement location="build/router.jar" />
                 <pathelement location="build/tools.jar" />
             </classpath>
diff --git a/core/java/build.xml b/core/java/build.xml
index 65d86fe8f..03277f91d 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -25,14 +25,14 @@
     <condition property="source.exclude1" value="gnu/gettext/GettextResource.java" else="NOTHING" >
         <istrue value="${with-gettext-base}" />
     </condition>
-    <condition property="javac.classpath.mod1" value="/usr/share/java/libintl.jar:" else="" >
+    <condition property="javac.classpath.mod1" value="build/libintl.jar:" else="" >
         <istrue value="${with-gettext-base}" />
     </condition>
     <!-- fixups if we're using gnu-getopt.jar for gnu/getopt/* -->
     <condition property="source.exclude2" value="gnu/getopt/**" else="NOTHING" >
         <istrue value="${with-libgetopt-java}" />
     </condition>
-    <condition property="javac.classpath.mod2" value="/usr/share/java/gnu-getopt.jar:" else="" >
+    <condition property="javac.classpath.mod2" value="build/gnu-getopt.jar:" else="" >
         <istrue value="${with-libgetopt-java}" />
     </condition>
     <condition property="translation.includes" value="NOTHING" else="gnu/getopt/*.properties" >
diff --git a/debian/rules b/debian/rules
index 2bdc23f22..3f6c97bcf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -141,9 +141,13 @@ endif
 
 	@# debian and ubuntu: everywhere
 	@/bin/echo -e "with-gettext-base=true" >> $(CURDIR)/override.properties
+	@#mkdir -p $(CURDIR)/core/java/build
+	ln -sf /usr/share/java/libintl.jar $(CURDIR)/core/java/build/libintl.jar
 
 	@# debian and ubuntu: everywhere
 	@/bin/echo -e "with-libgetopt-java=true" >> $(CURDIR)/override.properties
+	@#mkdir -p $(CURDIR)/core/java/build
+	ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
 
 	TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
 	echo router.updateDisabled=true > $(I2P)/router.config
diff --git a/installer/tools/java/build.xml b/installer/tools/java/build.xml
index ddb00137b..4c6f849a2 100644
--- a/installer/tools/java/build.xml
+++ b/installer/tools/java/build.xml
@@ -26,7 +26,7 @@
         <mkdir dir="./build/obj" />
         <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
             includeAntRuntime="false"
-            destdir="./build/obj" classpath="${javac.classpath}:../../../build/i2p.jar:../../../build/router.jar" >
+            destdir="./build/obj" classpath="${javac.classpath}:../../../build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../../build/router.jar" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
     </target>
diff --git a/router/java/build.xml b/router/java/build.xml
index b72169c44..f8708e22e 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -38,7 +38,7 @@
         <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
                debuglevel="lines,vars,source"
                includeAntRuntime="false"
-               destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar" >
+               destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar:../../core/java/build/gnu-getopt.jar" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
     </target>