diff --git a/LICENSE.txt b/LICENSE.txt
index 0c63d86ed7..99c83c33d0 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -106,6 +106,8 @@ Public domain except as listed below:
 
 Installer:
    Launch4j 3.0.1:
+   (Launch4j is only included in the upstream source package and Windows binaries.
+    Not applicable for non-Windows binaries or Debian/Launchpad packages.)
    Copyright (c) 2004, 2008 Grzegorz Kowal
    See licenses/LICENSE-Launch4j.txt (in binary packages)
    See installer/lib/launch4j/LICENSE.txt (in source packages)
diff --git a/build.xml b/build.xml
index 4d8e1bd3f0..ea5426fa0f 100644
--- a/build.xml
+++ b/build.xml
@@ -67,7 +67,7 @@
             <echo message="The following command will install all of the dependencies for you:" />
             <echo message=" " />
             <echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential \" />
-            <echo message="                   quilt libcommons-logging-java dh-apparmor" />
+            <echo message="                   quilt libcommons-logging-java dh-apparmor dh-systemd" />
             <echo message=" " />
             <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
             <echo message="to patch the source and build the packages." />
@@ -1111,7 +1111,7 @@
         <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
     </target>
 
-    <target name="preppkg-windows" depends="preppkg-base, buildUtilityJar, buildexe">
+    <target name="preppkg-windows" depends="preppkg-base, preplicenses-windows, buildUtilityJar, buildexe">
         <copy file="build/i2p.exe" todir="pkg-temp/" failonerror="false" />
         <copy file="apps/systray/java/lib/systray4j.dll" todir="pkg-temp/lib" />
         <copy file="apps/systray/java/resources/iggy.ico" todir="pkg-temp/icons" />
@@ -1201,24 +1201,30 @@
         </copy>
     </target>
 
+    <!-- does NOT include launch4j licenses for Windows builds -->
     <target name="preplicenses">
         <copy file="LICENSE.txt" todir="pkg-temp/" />
         <copy todir="pkg-temp/licenses/" >
           <fileset dir="licenses/" />
         </copy>
+        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
+        <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
+    </target>
+
+
+    <!-- DOES include launch4j licenses for Windows builds -->
+    <target name="preplicenses-windows" depends="preplicenses">
         <!--
               The license in launch4j/ is a BSD license for launch4j
               The license in launch4j/head is a MIT license for the code that is actually wrapped around the jars
               So we include the MIT one in our binary package
          -->
         <copy file="installer/lib/launch4j/head/LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Launch4j.txt" />
-        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
         <!--  Not sure if these are used or should be included -->
         <copy file="installer/lib/launch4j/lib/foxtrot.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Foxtrot.txt" />
         <copy file="installer/lib/launch4j/lib/JGoodies.Forms.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-JGoodies-Forms.txt" />
         <copy file="installer/lib/launch4j/lib/JGoodies.Looks.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-JGoodies-Looks.txt" />
         <copy file="installer/lib/launch4j/lib/XStream.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-XStream.txt" />
-        <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
     </target>
 
     <target name="prepthemeupdates">
diff --git a/debian/control b/debian/control
index 6c98c29cc6..e27e817291 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: i2p
-Maintainer: Kill Your TV <killyourtv@i2pmail.org>
+Maintainer: zzz <zzz@i2pmail.org>
 Section: net
 Standards-Version: 3.9.6
 Priority: optional
-Bugs: mailto:killyourtv@i2pmail.org
+Bugs: mailto:zzz@i2pmail.org
 Homepage: https://geti2p.net
 Build-Depends: debhelper (>= 7.0.50~)
  ,ant (>= 1.8)
diff --git a/debian/patches/0004-remove-launch4j.patch b/debian/patches/0004-remove-launch4j.patch
deleted file mode 100644
index 34e4a59f01..0000000000
--- a/debian/patches/0004-remove-launch4j.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Kill Your TV <killyourtv@i2pmail.org>
-Date: Mon, 30 Jul 2012 17:56:40 +0000
-Subject: remove launch4j
-
----
- build.xml | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 9544491..ce106bf 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1206,18 +1206,7 @@
-         <copy todir="pkg-temp/licenses/" >
-           <fileset dir="licenses/" />
-         </copy>
--        <!--
--              The license in launch4j/ is a BSD license for launch4j
--              The license in launch4j/head is a MIT license for the code that is actually wrapped around the jars
--              So we include the MIT one in our binary package
--         -->
--        <copy file="installer/lib/launch4j/head/LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Launch4j.txt" />
-         <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
--        <!--  Not sure if these are used or should be included -->
--        <copy file="installer/lib/launch4j/lib/foxtrot.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Foxtrot.txt" />
--        <copy file="installer/lib/launch4j/lib/JGoodies.Forms.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-JGoodies-Forms.txt" />
--        <copy file="installer/lib/launch4j/lib/JGoodies.Looks.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-JGoodies-Looks.txt" />
--        <copy file="installer/lib/launch4j/lib/XStream.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-XStream.txt" />
-         <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
-     </target>
- 
diff --git a/debian/patches/series b/debian/patches/series
index 4b78135017..9ff42c435e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-path-substitution.patch
 0002-jbigi-soname.patch
 0003-rename-jcpuid.patch
-0004-remove-launch4j.patch