diff --git a/build.xml b/build.xml
index 14a83cd9..d48d3968 100644
--- a/build.xml
+++ b/build.xml
@@ -141,6 +141,10 @@
 			<zipfileset src="${dir.lib}/jgat-custom.jar">
 				<include name="com/dmurph/tracking/**" />
 			</zipfileset>
+			
+			<zipfileset src="${dir.lib}/sevenzipjbinding.jar">
+				<include name="net/sf/sevenzipjbinding/**" />
+			</zipfileset>
 		</jar>
 	</target>
 
@@ -199,20 +203,22 @@
 	<target name="msi" depends="fatjar" description="Build Windows Installer for x86 and x64">
 		<antcall target="msi-arch">
 			<param name="arch" value="x86" />
+			<param name="libgcc_name" value="mingwm10.dll" />
 		</antcall>
 		<antcall target="msi-arch">
 			<param name="arch" value="x64" />
+			<param name="libgcc_name" value="libgcc_s_sjlj-1.dll" />
 		</antcall>
 	</target>
 
 	<target name="msi-arch">
 		<property name="mediainfo" location="${dir.lib}/native/win32-${arch}/MediaInfo.dll" />
-		<property name="lib7z_binding" location="${dir.lib}/native/win32-${arch}/lib7z-JBinding.dll" />
-		<property name="lib7z_gcc" location="${dir.lib}/native/win32-${arch}/lib7z-gcc.dll" />
+		<property name="lib7z_binding" location="${dir.lib}/native/win32-${arch}/lib7-Zip-JBinding.dll" />
+		<property name="libgcc_path" location="${dir.lib}/native/win32-${arch}/${libgcc_name}" />
 		<property name="installer" location="${dir.dist}/FileBot_${version}_${arch}.msi" />
-
+		
 		<exec executable="candle.exe" dir="${dir.installer}/msi" failonerror="true">
-			<arg line="filebot-wix.xml -out ${dir.dist}/msi.wixobj -arch ${arch} -dreleaseversion=${version} -dfatjar=${path.fatjar} -dmediainfo=${mediainfo} -dlib7z_binding=${lib7z_binding} -dlib7z_gcc=${lib7z_gcc}" />
+			<arg line="filebot-wix.xml -out ${dir.dist}/msi.wixobj -arch ${arch} -dreleaseversion=${version} -dfatjar=${path.fatjar} -dmediainfo=${mediainfo} -dlib7z_binding=${lib7z_binding} -dlibgcc_name=${libgcc_name} -dlibgcc_path=${libgcc_path}" />
 		</exec>
 		<exec executable="light.exe" dir="${dir.installer}/msi" failonerror="true">
 			<arg line="${dir.dist}/msi.wixobj -sval -ext WixUIExtension -out ${installer}" />
diff --git a/installer/msi/filebot-wix.xml b/installer/msi/filebot-wix.xml
index dc04dfb8..6c2057d3 100644
--- a/installer/msi/filebot-wix.xml
+++ b/installer/msi/filebot-wix.xml
@@ -32,8 +32,8 @@
 					<Component Id='ApplicationBase' Guid='9E365344-A00C-45DE-A2A4-266412C3D06E'>
 						<File Id='FileBot.jar' Name='FileBot.jar' Source='$(var.fatjar)' KeyPath='yes' />
 						<File Id='MediaInfo.dll' Name='MediaInfo.dll' Source='$(var.mediainfo)' />
-						<File Id='lib7z_JBinding.dll' Name='7z-JBinding.dll' Source='$(var.lib7z_binding)' />
-						<File Id='lib7z_gcc.dll' Name='7z-gcc.dll' Source='$(var.lib7z_gcc)' />
+						<File Id='lib7_Zip_JBinding.dll' Name='lib7-Zip-JBinding.dll' Source='$(var.lib7z_binding)' />
+						<File Id='libgcc.dll' Name='$(var.libgcc_name)' Source='$(var.libgcc_path)' />
 					</Component>
 				</Directory>
 			</Directory>
diff --git a/lib/native/linux-amd64/lib7z-JBinding.so b/lib/native/linux-amd64/lib7-Zip-JBinding.so
similarity index 100%
rename from lib/native/linux-amd64/lib7z-JBinding.so
rename to lib/native/linux-amd64/lib7-Zip-JBinding.so
diff --git a/lib/native/linux-i386/lib7z-JBinding.so b/lib/native/linux-i386/lib7-Zip-JBinding.so
similarity index 100%
rename from lib/native/linux-i386/lib7z-JBinding.so
rename to lib/native/linux-i386/lib7-Zip-JBinding.so
diff --git a/lib/native/mac-x86_64/lib7z-JBinding.dylib b/lib/native/mac-x86_64/lib7-Zip-JBinding.dylib
similarity index 100%
rename from lib/native/mac-x86_64/lib7z-JBinding.dylib
rename to lib/native/mac-x86_64/lib7-Zip-JBinding.dylib
diff --git a/lib/native/win32-x64/lib7z-JBinding.dll b/lib/native/win32-x64/lib7-Zip-JBinding.dll
similarity index 100%
rename from lib/native/win32-x64/lib7z-JBinding.dll
rename to lib/native/win32-x64/lib7-Zip-JBinding.dll
diff --git a/lib/native/win32-x64/lib7z-gcc.dll b/lib/native/win32-x64/libgcc_s_sjlj-1.dll
similarity index 100%
rename from lib/native/win32-x64/lib7z-gcc.dll
rename to lib/native/win32-x64/libgcc_s_sjlj-1.dll
diff --git a/lib/native/win32-x86/lib7z-JBinding.dll b/lib/native/win32-x86/lib7-Zip-JBinding.dll
similarity index 100%
rename from lib/native/win32-x86/lib7z-JBinding.dll
rename to lib/native/win32-x86/lib7-Zip-JBinding.dll
diff --git a/lib/native/win32-x86/lib7z-gcc.dll b/lib/native/win32-x86/mingwm10.dll
similarity index 100%
rename from lib/native/win32-x86/lib7z-gcc.dll
rename to lib/native/win32-x86/mingwm10.dll
diff --git a/source/net/sourceforge/filebot/archive/Archive.java b/source/net/sourceforge/filebot/archive/Archive.java
index 26097027..697330be 100644
--- a/source/net/sourceforge/filebot/archive/Archive.java
+++ b/source/net/sourceforge/filebot/archive/Archive.java
@@ -34,13 +34,13 @@ public class Archive implements Closeable {
 		// initialize 7z-JBinding native libs
 		try {
 			if (Platform.isWindows()) {
-				System.loadLibrary("lib7z-gcc");
+				System.loadLibrary(Platform.is64Bit() ? "libgcc_s_sjlj-1" : "mingwm10");
 			}
 			
-			System.loadLibrary("lib7z-JBinding");
+			System.loadLibrary("lib7-Zip-JBinding");
 			SevenZip.initLoadedLibraries();
 		} catch (Throwable e) {
-			Logger.getLogger(Archive.class.getName()).warning("Failed to load 7z-JBinding");
+			Logger.getLogger(Archive.class.getName()).warning("Failed to load 7z-JBinding: " + e.getMessage());
 		}
 	}