diff --git a/installer/install.xml b/installer/install.xml
index 9a7a3cb0b4075a2f69536d7cb7dc53d418926f45..6e1089f6a75be3f95e5da076b07918f5bf80f3e8 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -23,12 +23,12 @@
 
     <resources>
         <res id="Installer.image" src="installer/resources/i2plogo.png" />
-        <res id="LicencePanel.licence" src="installer/resources/readme.license.txt"/>
+        <res id="InfoPanel.info" src="installer/resources/readme.license.txt"/>
     </resources>
 
     <panels>
         <panel classname="HelloPanel"/>
-        <panel classname="LicencePanel"/>
+        <panel classname="InfoPanel"/>
         <panel classname="TargetPanel"/>
         <panel classname="InstallPanel"/>
         <panel classname="FinishPanel"/>
diff --git a/installer/lib/wrapper/aix/libwrapper.so b/installer/lib/wrapper/aix/libwrapper.so
new file mode 100644
index 0000000000000000000000000000000000000000..8fe160c13e853718685ff68ffe45fc9dd1396489
Binary files /dev/null and b/installer/lib/wrapper/aix/libwrapper.so differ
diff --git a/installer/lib/wrapper/freebsd/libwrapper.so b/installer/lib/wrapper/freebsd/libwrapper.so
new file mode 100644
index 0000000000000000000000000000000000000000..31babdaa0e72f56426ea306aa07d8baa754e6e1c
Binary files /dev/null and b/installer/lib/wrapper/freebsd/libwrapper.so differ
diff --git a/installer/lib/wrapper/hpux/libwrapper.so b/installer/lib/wrapper/hpux/libwrapper.so
new file mode 100644
index 0000000000000000000000000000000000000000..a5c45b39b1f9cf7416eb6b043d47754214663790
Binary files /dev/null and b/installer/lib/wrapper/hpux/libwrapper.so differ
diff --git a/installer/lib/wrapper/irix/libwrapper.so b/installer/lib/wrapper/irix/libwrapper.so
new file mode 100644
index 0000000000000000000000000000000000000000..74569c9b6d5d2ca583831b04f18148e5172a9b72
Binary files /dev/null and b/installer/lib/wrapper/irix/libwrapper.so differ
diff --git a/installer/lib/wrapper/linux/libwrapper.so b/installer/lib/wrapper/linux/libwrapper.so
new file mode 100644
index 0000000000000000000000000000000000000000..0d8763cb46c0f2e44745f950915f2b35009c9737
Binary files /dev/null and b/installer/lib/wrapper/linux/libwrapper.so differ
diff --git a/installer/lib/wrapper/osf1/libwrapper.so b/installer/lib/wrapper/osf1/libwrapper.so
new file mode 100644
index 0000000000000000000000000000000000000000..7687aa9a9e02ad2fa3ecec218f0db708d1de660c
Binary files /dev/null and b/installer/lib/wrapper/osf1/libwrapper.so differ
diff --git a/installer/lib/wrapper/solaris/libwrapper.so b/installer/lib/wrapper/solaris/libwrapper.so
new file mode 100644
index 0000000000000000000000000000000000000000..f63c88e83f1f842ec69f1ea56daaaa4ef1dac3b1
Binary files /dev/null and b/installer/lib/wrapper/solaris/libwrapper.so differ
diff --git a/installer/lib/wrapper/win32/I2Psvc.exe b/installer/lib/wrapper/win32/I2Psvc.exe
new file mode 100644
index 0000000000000000000000000000000000000000..392cf53d748391abf8bfa12e3216c3a95f1e105f
Binary files /dev/null and b/installer/lib/wrapper/win32/I2Psvc.exe differ
diff --git a/installer/lib/wrapper/win32/wrapper.dll b/installer/lib/wrapper/win32/wrapper.dll
new file mode 100644
index 0000000000000000000000000000000000000000..e15eaa8fdac27b2ef772a40ec6b030d1c6cf65d4
Binary files /dev/null and b/installer/lib/wrapper/win32/wrapper.dll differ
diff --git a/installer/resources/readme.license.txt b/installer/resources/readme.license.txt
index ea041a98e41b6513d42c64467cd825e7d85a31bb..93cc306acdeb208cf5a2afaadd43c5a8812f1ab0 100644
--- a/installer/resources/readme.license.txt
+++ b/installer/resources/readme.license.txt
@@ -1,3 +1,13 @@
 PUBLIC DOMAIN SOFTWARE
 
-I2P is public domain software; it is not licensed, it is not copyrighted.
+free (adj.) - unencumbered; not under the control of others
+
+This software is released into the public domain by the I2P
+project with no warranty of any kind, either expressed or
+implied. It probably won't make your computer catch on fire,
+or eat your children, but it might. Use at your own risk.
+
+I2P is distributed with the following non-public domain
+software:
+
+(Blah blah...)