diff --git a/Source/exehead/Main.c b/Source/exehead/Main.c
index ba830693..b8f52463 100644
--- a/Source/exehead/Main.c
+++ b/Source/exehead/Main.c
@@ -108,8 +108,9 @@ EXTERN_C void NSISWinMainNOCRT()
   // Note: We also import directly from KERNEL32, ADVAPI32 and SHELL32 so they 
   // are exempt from this requirement and SHELL32 imports from SHLWAPI on 
   // WoW64 systems and it is also on the KnownDLLs list so 
-  // SHLWAPI also gets a pass and that just leaves SHFOLDER.
-  g_SHGetFolderPath = myGetProcAddress(MGA_SHGetFolderPath);
+  // SHLWAPI also gets a pass and that just leaves 
+  myGetProcAddress(MGA_GetFileVersionInfo); // VERSION
+  g_SHGetFolderPath = myGetProcAddress(MGA_SHGetFolderPath); // and SHFOLDER
 
   {
     // workaround for bug #1008632
diff --git a/Source/exehead/SConscript b/Source/exehead/SConscript
index 0c1fa43f..e6fd3893 100644
--- a/Source/exehead/SConscript
+++ b/Source/exehead/SConscript
@@ -43,7 +43,6 @@ libs = Split("""
 	comdlg32
 	comctl32
 	ole32
-	version
 	uuid
 """)
 
diff --git a/Source/exehead/exec.c b/Source/exehead/exec.c
index 48ef9cb3..854f7dc7 100644
--- a/Source/exehead/exec.c
+++ b/Source/exehead/exec.c
@@ -946,13 +946,11 @@ static int NSISCALL ExecuteEntry(entry *entry_)
 #ifdef NSIS_SUPPORT_GETDLLVERSION
     case EW_GETDLLVERSION:
       {
-        TCHAR *highout=var0;
-        TCHAR *lowout=var1;
-        DWORD s1;
+        TCHAR *highout=var0, *lowout=var1;
+        DWORD s1, d;
         VS_FIXEDFILEINFO *pvsf1;
-        DWORD d;
         TCHAR *buf1=GetStringFromParm(-0x12);
-        s1=GetFileVersionInfoSize(buf1,&d);
+        s1=((DWORD(WINAPI*)(LPCTSTR,DWORD*))myGetProcAddress(MGA_GetFileVersionInfoSize))(buf1,&d);
         *lowout=*highout=0;
         exec_error++;
         if (s1)
@@ -961,8 +959,10 @@ static int NSISCALL ExecuteEntry(entry *entry_)
           b1=GlobalAlloc(GPTR,s1);
           if (b1)
           {
+            FARPROC gfvi = myGetProcAddress(MGA_GetFileVersionInfo), vqv = myGetProcAddress(MGA_VerQueryValue);
             UINT uLen;
-            if (GetFileVersionInfo(buf1,0,s1,b1) && VerQueryValue(b1,_T("\\"),(void*)&pvsf1,&uLen))
+            if ( ((BOOL(WINAPI*)(LPCTSTR,DWORD,DWORD,LPVOID))gfvi)(buf1,0,s1,b1)
+              && ((BOOL(WINAPI*)(LPCVOID,LPCTSTR,LPVOID*,UINT*))vqv)(b1,_T("\\"),(void*)&pvsf1,&uLen) )
             {
               myitoa(highout,pvsf1->dwFileVersionMS);
               myitoa(lowout,pvsf1->dwFileVersionLS);
diff --git a/Source/exehead/util.c b/Source/exehead/util.c
index 4fe45890..c93e5871 100644
--- a/Source/exehead/util.c
+++ b/Source/exehead/util.c
@@ -1070,7 +1070,10 @@ struct MGA_FUNC MGA_FUNCS[] = {
 #endif
   {"ADVAPI32", "InitiateShutdownW"},
   {"SHLWAPI",  "SHAutoComplete"},
-  {"SHFOLDER", "SHGetFolderPathW"}
+  {"SHFOLDER", "SHGetFolderPathW"},
+  {"VERSION",  "GetFileVersionInfoSizeW"},
+  {"VERSION",  "GetFileVersionInfoW"},
+  {"VERSION",  "VerQueryValueW"}
 };
 #else
   {"KERNEL32", "GetDiskFreeSpaceExA"},
@@ -1078,7 +1081,10 @@ struct MGA_FUNC MGA_FUNCS[] = {
   {"ADVAPI32", "RegDeleteKeyExA"},
   {"ADVAPI32", "InitiateShutdownA"},
   {"SHLWAPI",  "SHAutoComplete"},
-  {"SHFOLDER", "SHGetFolderPathA"}
+  {"SHFOLDER", "SHGetFolderPathA"},
+  {"VERSION",  "GetFileVersionInfoSizeA"},
+  {"VERSION",  "GetFileVersionInfoA"},
+  {"VERSION",  "VerQueryValueA"}
 };
 #endif
 
diff --git a/Source/exehead/util.h b/Source/exehead/util.h
index 06323caf..ba0d75c0 100644
--- a/Source/exehead/util.h
+++ b/Source/exehead/util.h
@@ -127,6 +127,9 @@ enum myGetProcAddressFunctions {
   MGA_InitiateShutdown,
   MGA_SHAutoComplete, // x64 can link to shlwapi directly but as long as MGA_SHGetFolderPath is used we can stick with myGetProcAddress
   MGA_SHGetFolderPath, // TODO: This can probably call something else directly on x64
+  MGA_GetFileVersionInfoSize, // Version.dll exists in all Windows versions, it is delay loaded to avoid dll hijacking [bug #1125]
+  MGA_GetFileVersionInfo,
+  MGA_VerQueryValue
 };
 
 void * NSISCALL myGetProcAddress(const enum myGetProcAddressFunctions func);