diff --git a/installer/install.xml b/installer/install.xml
index 213cc9185c..04f91be712 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -151,6 +151,13 @@
 	    <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"
 		condition="is64bit" > <os family="windows" />
 		<args><arg value="$INSTALL_PATH\lib\wrapper\win64\wrapper.dll" /><arg value="$INSTALL_PATH\lib" /></args></executable>
+	     <!-- We still copy the 32 bit version of wrapper.dll (even with a
+		  64bit jvm) so that if a 32 bit jvm is installed in the
+		  future, nothing breaks.
+		  -->
+	     <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"
+                condition="is64bit" > <os family="windows" />
+                <args><arg value="$INSTALL_PATH\lib\wrapper\win32\wrapper.dll" /><arg value="$INSTALL_PATH\lib\wrapper-windows-x86-32.dll" /></args></executable>
             <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
                 <args><arg value="$INSTALL_PATH\i2prouter" /></args></executable>
             <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
diff --git a/installer/resources/postinstall.sh b/installer/resources/postinstall.sh
index 4f77ad534c..a8882f71ff 100644
--- a/installer/resources/postinstall.sh
+++ b/installer/resources/postinstall.sh
@@ -42,6 +42,8 @@ case $HOST_OS in
         else
             wrapperpath="./lib/wrapper/linux64"
             cp ${wrapperpath}/libwrapper.so ./lib
+	    # the 32bit libwrapper.so will be needed if a 32 bit jvm is used
+	    cp ./lib/wrapper/linux/libwrapper.so ./lib/libwrapper-linux-x86-32.so
         fi
         ;;
     freebsd )
@@ -51,6 +53,8 @@ case $HOST_OS in
 	else
 	    wrapperpath="./lib/wrapper/freebsd64"
 	    cp ${wrapperpath}/libwrapper.so ./lib/
+	    # the 32bit libwrapper.so will be needed if a 32 bit jvm is used
+	    cp ./lib/freebsd/libwrapper.so ./lib/libwrapper-freebsd-x86-32.so
 	fi
         ;;
     osx )
@@ -67,7 +71,6 @@ case $HOST_OS in
         ;;
 esac
 
-#cp $wrapperpath/wrapper.jar ./lib/
 cp $wrapperpath/i2psvc .
 chmod 755 ./eepget
 chmod 755 ./i2psvc