diff --git a/Core/src/org/sleuthkit/autopsy/core/Installer.java b/Core/src/org/sleuthkit/autopsy/core/Installer.java
index 8809bb549f..bc14db3b7d 100644
--- a/Core/src/org/sleuthkit/autopsy/core/Installer.java
+++ b/Core/src/org/sleuthkit/autopsy/core/Installer.java
@@ -66,7 +66,7 @@ public class Installer extends ModuleInstall {
                 //We should update this if we officially switch to a new version of CRT/compiler
                 System.loadLibrary("msvcr100"); //NON-NLS
                 System.loadLibrary("msvcp100"); //NON-NLS
-                
+
                 logger.log(Level.INFO, "MSVCR100 and MSVCP100 libraries loaded"); //NON-NLS
             } catch (UnsatisfiedLinkError e) {
                 logger.log(Level.SEVERE, "Error loading MSVCR100 and MSVCP100 libraries, ", e); //NON-NLS
@@ -85,14 +85,14 @@ public class Installer extends ModuleInstall {
             } catch (UnsatisfiedLinkError e) {
                 logger.log(Level.SEVERE, "Error loading EWF library, ", e); //NON-NLS
             }
-            
+
             try {
                 System.loadLibrary("libvmdk"); //NON-NLS
                 logger.log(Level.INFO, "VMDK library loaded"); //NON-NLS
             } catch (UnsatisfiedLinkError e) {
                 logger.log(Level.SEVERE, "Error loading VMDK library, ", e); //NON-NLS
             }
-            
+
             try {
                 System.loadLibrary("libvhdi"); //NON-NLS
                 logger.log(Level.INFO, "VHDI library loaded"); //NON-NLS
@@ -107,7 +107,7 @@ public class Installer extends ModuleInstall {
             } catch (UnsatisfiedLinkError e) {
                 logger.log(Level.SEVERE, "Error loading MSVCR120 library, ", e); //NON-NLS
             }
-            
+
             try {
                 System.loadLibrary("libeay32"); //NON-NLS
                 logger.log(Level.INFO, "LIBEAY32 library loaded"); //NON-NLS
@@ -122,18 +122,20 @@ public class Installer extends ModuleInstall {
                 logger.log(Level.SEVERE, "Error loading SSLEAY32 library, ", e); //NON-NLS
             }
 
-            // This library name is different in 32-bit versus 64-bit
-            String libintlName = "libintl-8"; //NON-NLS
-            if (PlatformUtil.is64BitJVM() == false) {
-                libintlName = "intl"; //NON-NLS
-            }
             try {
-                System.loadLibrary(libintlName); //NON-NLS
-                logger.log(Level.INFO, libintlName + " library loaded"); //NON-NLS
+                System.loadLibrary("libiconv-2"); //NON-NLS
+                logger.log(Level.INFO, "libiconv-2 library loaded"); //NON-NLS
             } catch (UnsatisfiedLinkError e) {
-                logger.log(Level.SEVERE, "Error loading " + libintlName + " library, ", e); //NON-NLS
+                logger.log(Level.SEVERE, "Error loading libiconv-2 library, ", e); //NON-NLS
             }
 
+            try {
+                System.loadLibrary("libintl-8"); //NON-NLS
+                logger.log(Level.INFO, "libintl-8 library loaded"); //NON-NLS
+            } catch (UnsatisfiedLinkError e) {
+                logger.log(Level.SEVERE, "Error loading libintl-8 library, ", e); //NON-NLS
+            }
+            
             try {
                 System.loadLibrary("libpq"); //NON-NLS
                 logger.log(Level.INFO, "LIBPQ library loaded"); //NON-NLS
@@ -156,7 +158,7 @@ public class Installer extends ModuleInstall {
     /**
      * Check if JavaFx initialized
      *
-     * @return false if java fx not initialized (classes coult not load), true
+     * @return false if java fx not initialized (classes could not load), true
      *         if initialized
      */
     public static boolean isJavaFxInited() {
diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
index 387cfb83e3..f5b6d29df1 100644
--- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
+++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
@@ -1,5 +1,5 @@
 #Updated by build script
-#Mon, 22 Feb 2016 16:37:47 -0500
+#Tue, 28 Jun 2016 10:55:17 -0400
 LBL_splash_window_title=Starting Autopsy
 SPLASH_HEIGHT=314
 SPLASH_WIDTH=538
diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
index eac00c4b67..589cabd769 100644
--- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
+++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,4 +1,4 @@
 #Updated by build script
-#Mon, 22 Feb 2016 16:37:47 -0500
+#Tue, 28 Jun 2016 10:55:17 -0400
 CTL_MainWindow_Title=Autopsy 4.1.0
 CTL_MainWindow_Title_No_Project=Autopsy 4.1.0
diff --git a/build-windows.xml b/build-windows.xml
index d462070294..560a19875e 100644
--- a/build-windows.xml
+++ b/build-windows.xml
@@ -53,6 +53,7 @@
             <include name="libeay32.dll"/>
             <include name="ssleay32.dll"/>
             <include name="libintl-8.dll"/>
+            <include name="libiconv-2.dll"/>
             <include name="libpq.dll"/>
             <include name="msvcr120.dll"/>
         </fileset>
diff --git a/build.xml b/build.xml
index daae174c11..c898e32189 100755
--- a/build.xml
+++ b/build.xml
@@ -115,6 +115,7 @@
                 <include name="libvhdi.dll"/>
                 <include name="zlib.dll" />
                 <include name="libintl-8.dll"/>
+                <include name="libiconv-2.dll"/>
                 <include name="ssleay32.dll"/>
                 <include name="libeay32.dll"/>
                 <include name="libpq.dll"/>