diff --git a/out/heidisql.iss b/out/heidisql.iss
index 3b13a57b..1a34f5bd 100644
--- a/out/heidisql.iss
+++ b/out/heidisql.iss
@@ -94,11 +94,13 @@ Source: "libmysql32.dll"; DestDir: "{app}"; DestName: "libmysql.dll"; Check: not
 Source: "libpq64.dll"; DestDir: "{app}"; DestName: "libpq.dll"; Check: Is64BitInstallMode; Flags: ignoreversion
 Source: "libpq32.dll"; DestDir: "{app}"; DestName: "libpq.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion
 Source: "libintl-864.dll"; DestDir: "{app}"; DestName: "libintl-8.dll"; Check: Is64BitInstallMode; Flags: ignoreversion
-Source: "libintl32.dll"; DestDir: "{app}"; DestName: "libintl.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion
+Source: "libintl-832.dll"; DestDir: "{app}"; DestName: "libintl-8.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion
 Source: "ssleay32-64.dll"; DestDir: "{app}"; DestName: "ssleay32.dll"; Check: Is64BitInstallMode; Flags: ignoreversion
 Source: "ssleay32-32.dll"; DestDir: "{app}"; DestName: "ssleay32.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion
 Source: "libeay32-64.dll"; DestDir: "{app}"; DestName: "libeay32.dll"; Check: Is64BitInstallMode; Flags: ignoreversion
 Source: "libeay32-32.dll"; DestDir: "{app}"; DestName: "libeay32.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion
+Source: "libiconv-264.dll"; DestDir: "{app}"; DestName: "libiconv-2.dll"; Check: Is64BitInstallMode; Flags: ignoreversion
+Source: "libiconv-232.dll"; DestDir: "{app}"; DestName: "libiconv-2.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion
 Source: "plugins64\*.dll"; DestDir: "{app}\plugins"; Check: Is64BitInstallMode; Flags: ignoreversion
 Source: "plugins32\*.dll"; DestDir: "{app}\plugins"; Check: not Is64BitInstallMode; Flags: ignoreversion
 Source: "Snippets\*.sql"; DestDir: "{commonappdata}\{#ProgName}\Snippets";
diff --git a/out/heidisql32.iss b/out/heidisql32.iss
index 9b084d86..6d5e1daf 100644
--- a/out/heidisql32.iss
+++ b/out/heidisql32.iss
@@ -91,9 +91,10 @@ Source: "license.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "gpl.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "libmysql32.dll"; DestDir: "{app}"; DestName: "libmysql.dll"; Flags: ignoreversion
 Source: "libpq32.dll"; DestDir: "{app}"; DestName: "libpq.dll"; Flags: ignoreversion
-Source: "libintl32.dll"; DestDir: "{app}"; DestName: "libintl.dll"; Flags: ignoreversion
+Source: "libintl-832.dll"; DestDir: "{app}"; DestName: "libintl-8.dll"; Flags: ignoreversion
 Source: "ssleay32-32.dll"; DestDir: "{app}"; DestName: "ssleay32.dll"; Flags: ignoreversion
 Source: "libeay32-32.dll"; DestDir: "{app}"; DestName: "libeay32.dll"; Flags: ignoreversion
+Source: "libiconv-232.dll"; DestDir: "{app}"; DestName: "libiconv-2.dll"; Flags: ignoreversion
 Source: "plugins32\*.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion
 Source: "Snippets\*.sql"; DestDir: "{commonappdata}\{#ProgName}\Snippets";
 
diff --git a/out/libeay32-32.dll b/out/libeay32-32.dll
index 31380c14..fdd929b9 100644
Binary files a/out/libeay32-32.dll and b/out/libeay32-32.dll differ
diff --git a/out/libeay32-64.dll b/out/libeay32-64.dll
index 2ee8a7ce..bc96d8e9 100644
Binary files a/out/libeay32-64.dll and b/out/libeay32-64.dll differ
diff --git a/out/libiconv-232.dll b/out/libiconv-232.dll
new file mode 100644
index 00000000..f7f78fcd
Binary files /dev/null and b/out/libiconv-232.dll differ
diff --git a/out/libiconv-264.dll b/out/libiconv-264.dll
new file mode 100644
index 00000000..eddbb5d3
Binary files /dev/null and b/out/libiconv-264.dll differ
diff --git a/out/libintl-832.dll b/out/libintl-832.dll
new file mode 100644
index 00000000..4a69b7c2
Binary files /dev/null and b/out/libintl-832.dll differ
diff --git a/out/libintl-864.dll b/out/libintl-864.dll
index de0ef304..d6844235 100644
Binary files a/out/libintl-864.dll and b/out/libintl-864.dll differ
diff --git a/out/libintl32.dll b/out/libintl32.dll
deleted file mode 100644
index 12f25af9..00000000
Binary files a/out/libintl32.dll and /dev/null differ
diff --git a/out/libpq32.dll b/out/libpq32.dll
index 83f85004..76485dd2 100644
Binary files a/out/libpq32.dll and b/out/libpq32.dll differ
diff --git a/out/libpq64.dll b/out/libpq64.dll
index 9a2de0b8..1be56e8e 100644
Binary files a/out/libpq64.dll and b/out/libpq64.dll differ
diff --git a/out/ssleay32-32.dll b/out/ssleay32-32.dll
index eb62423e..32d800fc 100644
Binary files a/out/ssleay32-32.dll and b/out/ssleay32-32.dll differ
diff --git a/out/ssleay32-64.dll b/out/ssleay32-64.dll
index acd872f3..9fda6c9c 100644
Binary files a/out/ssleay32-64.dll and b/out/ssleay32-64.dll differ
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index 3394aa86..3f5270cd 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -2090,18 +2090,15 @@ end;
 
 
 procedure TPgConnection.DoBeforeConnect;
-var
-  LibWithPath: String;
 begin
   // Init lib before actually connecting.
   // Each connection has its own library handle
   if LibPqHandle = 0 then begin
-    LibWithPath := ExtractFileDir(Application.ExeName) + '\' + LibPqPath;
-    if not FileExists(LibWithPath) then
+    Log(lcDebug, f_('Loading library file %s ...', [LibPqPath]));
+    LibPqHandle := LoadLibrary(PWideChar(LibPqPath));
+    if LibPqHandle = 0 then
       raise EDatabaseError.CreateFmt(_('Cannot find a usable %s. Please launch %s from the directory where you have installed it.'), [LibPqPath, ExtractFileName(ParamStr(0))])
     else begin
-      Log(lcDebug, f_('Loading library file %s ...', [LibWithPath]));
-      LibPqHandle := LoadLibrary(PWideChar(LibWithPath));
       AssignProc(@PQconnectdb, 'PQconnectdb');
       AssignProc(@PQerrorMessage, 'PQerrorMessage');
       AssignProc(@PQresultErrorMessage, 'PQresultErrorMessage');