diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi
index d5f6bd5a55..11a4dd66e5 100644
--- a/src/WINNT/install/NSIS/OpenAFS.nsi
+++ b/src/WINNT/install/NSIS/OpenAFS.nsi
@@ -538,7 +538,7 @@ Section "AFS Client" secClient
   
   ; Do Windows SYSDIR (Control panel)
   SetOutPath "$SYSDIR"
-  File "${AFS_CLIENT_BUILDDIR}\afs_cpa.cpl"
+  !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_cpa.cpl" "$SYSDIR\afs_cpa.cpl" "$INSTDIR"
 !ifdef DEBUG
   File "${AFS_CLIENT_BUILDDIR}\afs_cpa.pdb"
 !endif
@@ -783,7 +783,7 @@ skipCheck:
    Call AFSLangFiles
    
    SetOutPath "$SYSDIR"
-   File "${AFS_SERVER_BUILDDIR}\afsserver.cpl"
+  !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afsserver.cpl" "$SYSDIR\afsserver.cpl" "$INSTDIR"
 
 !ifdef DEBUG
    File "${AFS_SERVER_BUILDDIR}\afsserver.pdb"
@@ -2577,23 +2577,23 @@ DoEnglish:
    File "..\..\doc\install\Documentation\en_US\README.TXT"
 
    SetOutPath "$INSTDIR\Client\Program"
-   File "${AFS_CLIENT_BUILDDIR}\afscreds_1033.dll"
-  !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1033.dll" "$INSTDIR\Client\Program\afs_shl_ext_1033.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afscreds_1033.dll"    "$INSTDIR\Client\Program\afscreds_1033.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1033.dll" "$INSTDIR\Client\Program\afs_shl_ext_1033.dll" "$INSTDIR"
 !ifdef DEBUG
    ;File "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1033.pdb"
    ;File "${AFS_CLIENT_BUILDDIR}\afscreds_1033.pdb"
 !endif
 
    SetOutPath "$INSTDIR\Common"
-   File "${AFS_CLIENT_BUILDDIR}\afs_config_1033.dll"
-   File "${AFS_CLIENT_BUILDDIR}\afs_cpa_1033.dll"
-   File "${AFS_SERVER_BUILDDIR}\afseventmsg_1033.dll"
-   ;File "${AFS_SERVER_BUILDDIR}\afs_setup_utils_1033.dll"
-   File "${AFS_SERVER_BUILDDIR}\afsserver_1033.dll"
-   File "${AFS_SERVER_BUILDDIR}\afssvrcfg_1033.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_1033.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_1033.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_1033.dll"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_config_1033.dll"           "$INSTDIR\Common\afs_config_1033.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_cpa_1033.dll"              "$INSTDIR\Common\afs_cpa_1033.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afseventmsg_1033.dll"          "$INSTDIR\Common\afseventmsg_1033.dll" "$INSTDIR"
+  ;!insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afs_setup_utils_1033.dll"      "$INSTDIR\Common\afs_setup_utils_1033.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afsserver_1033.dll"            "$INSTDIR\Common\afsserver_1033.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afssvrcfg_1033.dll"            "$INSTDIR\Common\afssvrcfg_1033.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_1033.dll"  "$INSTDIR\Common\TaAfsAccountManager_1033.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_1033.dll"          "$INSTDIR\Common\TaAfsApplLib_1033.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_1033.dll"   "$INSTDIR\Common\TaAfsServerManager_1033.dll" "$INSTDIR"
    File "..\..\doc\help\en_US\afs-cc.CNT"
    File "..\..\doc\help\en_US\afs-cc.hlp"
    File "..\..\doc\help\en_US\afs-light.CNT"
@@ -2625,7 +2625,7 @@ DoGerman:
    File "..\..\doc\install\Documentation\de_DE\README.TXT"
 
    SetOutPath "$INSTDIR\Client\Program"
-   File "${AFS_CLIENT_BUILDDIR}\afscreds_1032.dll"
+  !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afscreds_1032.dll"                      "$INSTDIR\Client\Program\afscreds_1032.dll" "$INSTDIR"
   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1032.dll" "$INSTDIR\Client\Program\afs_shl_ext_1032.dll" "$INSTDIR"
 !ifdef DEBUG
    ;File "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1032.pdb"
@@ -2633,15 +2633,15 @@ DoGerman:
 !endif
 
    SetOutPath "$INSTDIR\Common"
-   File "${AFS_CLIENT_BUILDDIR}\afs_config_1032.dll"
-   File "${AFS_CLIENT_BUILDDIR}\afs_cpa_1032.dll"
-   File "${AFS_SERVER_BUILDDIR}\afseventmsg_1032.dll"
-   ;File "${AFS_SERVER_BUILDDIR}\afs_setup_utils_1032.dll"
-   File "${AFS_SERVER_BUILDDIR}\afsserver_1032.dll"
-   File "${AFS_SERVER_BUILDDIR}\afssvrcfg_1032.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_1032.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_1032.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_1032.dll"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_config_1032.dll"           "$INSTDIR\Common\afs_config_1032.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_cpa_1032.dll"              "$INSTDIR\Common\afs_cpa_1032.dll" "$INSTDIR" 
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afseventmsg_1032.dll"          "$INSTDIR\Common\afseventmsg_1032.dll" "$INSTDIR" 
+  ;!insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afs_setup_utils_1032.dll"      "$INSTDIR\Common\afs_setup_utils_1032.dll" "$INSTDIR" 
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afsserver_1032.dll"            "$INSTDIR\Common\afsserver_1032.dll" "$INSTDIR" 
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afssvrcfg_1032.dll"            "$INSTDIR\Common\afssvrcfg_1032.dll" "$INSTDIR" 
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_1032.dll"  "$INSTDIR\Common\TaAfsAccountManager_1032.dll" "$INSTDIR" 
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_1032.dll"          "$INSTDIR\Common\TaAfsAppLib_1032.dll" "$INSTDIR" 
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_1032.dll"   "$INSTDIR\Common\TaAfsServerManager_1032.dll" "$INSTDIR" 
    File "..\..\doc\help\de_DE\afs-cc.CNT"
    File "..\..\doc\help\de_DE\afs-cc.hlp"
    File "..\..\doc\help\de_DE\afs-light.CNT"
@@ -2673,23 +2673,23 @@ DoSpanish:
    File "..\..\doc\install\Documentation\es_ES\README.TXT"
 
    SetOutPath "$INSTDIR\Client\Program"
-   File "${AFS_CLIENT_BUILDDIR}\afscreds_1034.dll"
-  !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1034.dll" "$INSTDIR\Client\Program\afs_shl_ext_1034.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afscreds_1034.dll"     "$INSTDIR\Client\Program\afscreds_1034.dll" "$INSTDIR" 
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1034.dll" "$INSTDIR\Client\Program\afs_shl_ext_1034.dll" "$INSTDIR"
 !ifdef DEBUG
    ;File "${AFS_CLIENT_BUILDDIR}\afscreds_1034.pdb"
    ;File "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1034.pdb"
 !endif
 
    SetOutPath "$INSTDIR\Common"
-   File "${AFS_CLIENT_BUILDDIR}\afs_config_1034.dll"
-   File "${AFS_CLIENT_BUILDDIR}\afs_cpa_1034.dll"
-   File "${AFS_SERVER_BUILDDIR}\afseventmsg_1034.dll"
-   ;File "${AFS_SERVER_BUILDDIR}\afs_setup_utils_1034.dll"
-   File "${AFS_SERVER_BUILDDIR}\afsserver_1034.dll"
-   File "${AFS_SERVER_BUILDDIR}\afssvrcfg_1034.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_1034.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_1034.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_1034.dll"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_config_1034.dll"          "$INSTDIR\Common\afs_config_1034.dll" "$INSTDIR"  
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_cpa_1034.dll"             "$INSTDIR\Common\afs_cpa_1034.dll" "$INSTDIR"  
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afseventmsg_1034.dll"         "$INSTDIR\Common\afseventmsg_1034.dll" "$INSTDIR"  
+  ;!insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afs_setup_utils_1034.dll"     "$INSTDIR\Common\afs_setup_utils_1034.dll" "$INSTDIR"  
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afsserver_1034.dll"           "$INSTDIR\Common\afsserver_1034.dll" "$INSTDIR"  
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afssvrcfg_1034.dll"           "$INSTDIR\Common\afssvrcfg_1034.dll" "$INSTDIR"  
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_1034.dll" "$INSTDIR\Common\TaAfsAccountManager_1034.dll" "$INSTDIR"  
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_1034.dll"         "$INSTDIR\Common\TaAfsAppLib_1034.dll" "$INSTDIR"  
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_1034.dll"  "$INSTDIR\Common\TaAfsServerManager_1034.dll" "$INSTDIR"  
    File "..\..\doc\help\es_ES\afs-cc.CNT"
    File "..\..\doc\help\es_ES\afs-cc.hlp"
    File "..\..\doc\help\es_ES\afs-light.CNT"
@@ -2721,23 +2721,23 @@ DoJapanese:
    File "..\..\doc\install\Documentation\ja_JP\README.TXT"
 
    SetOutPath "$INSTDIR\Client\Program"
-   File "${AFS_CLIENT_BUILDDIR}\afscreds_1041.dll"
-  !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1041.dll" "$INSTDIR\Client\Program\afs_shl_ext_1041.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afscreds_1041.dll"  "$INSTDIR\Client\Program\afscreds_1041.dll" "$INSTDIR"  
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1041.dll" "$INSTDIR\Client\Program\afs_shl_ext_1041.dll" "$INSTDIR"
 !ifdef DEBUG
    ;File "${AFS_CLIENT_BUILDDIR}\afscreds_1041.pdb"
    ;File "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1041.pdb"
 !endif
 
    SetOutPath "$INSTDIR\Common"
-   File "${AFS_CLIENT_BUILDDIR}\afs_config_1041.dll"
-   File "${AFS_CLIENT_BUILDDIR}\afs_cpa_1041.dll"
-   File "${AFS_SERVER_BUILDDIR}\afseventmsg_1041.dll"
-   ;File "${AFS_SERVER_BUILDDIR}\afs_setup_utils_1041.dll"
-   File "${AFS_SERVER_BUILDDIR}\afsserver_1041.dll"
-   File "${AFS_SERVER_BUILDDIR}\afssvrcfg_1041.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_1041.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_1041.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_1041.dll"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_config_1041.dll"           "$INSTDIR\Common\afs_config_1041.dll" "$INSTDIR"   
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_cpa_1041.dll"              "$INSTDIR\Common\afs_cpa_1041.dll" "$INSTDIR"   
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afseventmsg_1041.dll"          "$INSTDIR\Common\afseventmsg_1041.dll" "$INSTDIR"   
+  ;!insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afs_setup_utils_1041.dll"      "$INSTDIR\Common\afs_setup_utils_1041.dll" "$INSTDIR"   
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afsserver_1041.dll"            "$INSTDIR\Common\afsserver_1041.dll" "$INSTDIR"   
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afssvrcfg_1041.dll"            "$INSTDIR\Common\afssvrcfg_1041.dll" "$INSTDIR"   
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_1041.dll"  "$INSTDIR\Common\TaAfsAccountManager_1041.dll" "$INSTDIR"   
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_1041.dll"          "$INSTDIR\Common\TaAfsAppLib_1041.dll" "$INSTDIR"   
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_1041.dll"   "$INSTDIR\Common\TaAfsServerManager_1041.dll" "$INSTDIR"   
    File "..\..\doc\help\ja_JP\afs-cc.CNT"
    File "..\..\doc\help\ja_JP\afs-cc.hlp"
    File "..\..\doc\help\ja_JP\afs-light.CNT"
@@ -2769,23 +2769,23 @@ DoKorean:
    File "..\..\doc\install\Documentation\ko_KR\README.TXT"
 
    SetOutPath "$INSTDIR\Client\Program"
-   File "${AFS_CLIENT_BUILDDIR}\afscreds_1042.dll"
-  !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1042.dll" "$INSTDIR\Client\Program\afs_shl_ext_1042.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afscreds_1042.dll"  "$INSTDIR\Client\Program\afscreds_1042.dll" "$INSTDIR"   
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1042.dll" "$INSTDIR\Client\Program\afs_shl_ext_1042.dll" "$INSTDIR"
 !ifdef DEBUG
    ;File "${AFS_CLIENT_BUILDDIR}\afscreds_1042.pdb"
    ;File "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1042.pdb"
 !endif
 
    SetOutPath "$INSTDIR\Common"
-   File "${AFS_CLIENT_BUILDDIR}\afs_config_1042.dll"
-   File "${AFS_CLIENT_BUILDDIR}\afs_cpa_1042.dll"
-   File "${AFS_SERVER_BUILDDIR}\afseventmsg_1042.dll"
-   ;File "${AFS_SERVER_BUILDDIR}\afs_setup_utils_1042.dll"
-   File "${AFS_SERVER_BUILDDIR}\afsserver_1042.dll"
-   File "${AFS_SERVER_BUILDDIR}\afssvrcfg_1042.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_1042.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_1042.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_1042.dll"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_config_1042.dll"           "$INSTDIR\Common\afs_config_1042.dll" "$INSTDIR"    
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_cpa_1042.dll"              "$INSTDIR\Common\afs_cpa_1042.dll" "$INSTDIR"    
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afseventmsg_1042.dll"          "$INSTDIR\Common\afseventmsg_1042.dll" "$INSTDIR"    
+  ;!insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afs_setup_utils_1042.dll"      "$INSTDIR\Common\afs_setup_utils_1042.dll" "$INSTDIR"    
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afsserver_1042.dll"            "$INSTDIR\Common\afsserver_1042.dll" "$INSTDIR"    
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afssvrcfg_1042.dll"            "$INSTDIR\Common\afssvrcfg_1042.dll" "$INSTDIR"    
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_1042.dll"  "$INSTDIR\Common\TaAfsAccountManager_1042.dll" "$INSTDIR"    
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_1042.dll"          "$INSTDIR\Common\TaAfsAppLib_1042.dll" "$INSTDIR"    
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_1042.dll"   "$INSTDIR\Common\TaAfsServerManager_1042.dll" "$INSTDIR"    
    File "..\..\doc\help\ko_KR\afs-cc.CNT"
    File "..\..\doc\help\ko_KR\afs-cc.hlp"
    File "..\..\doc\help\ko_KR\afs-light.CNT"
@@ -2818,23 +2818,23 @@ DoPortugueseBR:
    File "..\..\doc\install\Documentation\pt_BR\README.TXT"
 
    SetOutPath "$INSTDIR\Client\Program"
-   File "${AFS_CLIENT_BUILDDIR}\afscreds_1046.dll"
-  !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1046.dll" "$INSTDIR\Client\Program\afs_shl_ext_1046.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL  "${AFS_CLIENT_BUILDDIR}\afscreds_1046.dll"  "$INSTDIR\Client\Program\afscreds_1046.dll" "$INSTDIR"    
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1046.dll" "$INSTDIR\Client\Program\afs_shl_ext_1046.dll" "$INSTDIR"
 !ifdef DEBUG
    ;File "${AFS_CLIENT_BUILDDIR}\afscreds_1046.pdb"
    ;File "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1046.pdb"
 !endif
 
    SetOutPath "$INSTDIR\Common"
-   File "${AFS_CLIENT_BUILDDIR}\afs_config_1046.dll"
-   File "${AFS_CLIENT_BUILDDIR}\afs_cpa_1046.dll"
-   File "${AFS_SERVER_BUILDDIR}\afseventmsg_1046.dll"
-   ;File "${AFS_SERVER_BUILDDIR}\afs_setup_utils_1046.dll"
-   File "${AFS_SERVER_BUILDDIR}\afsserver_1046.dll"
-   File "${AFS_SERVER_BUILDDIR}\afssvrcfg_1046.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_1046.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_1046.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_1046.dll"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_config_1046.dll"           "$INSTDIR\Common\afs_config_1046.dll" "$INSTDIR"     
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_cpa_1046.dll"              "$INSTDIR\Common\afs_cpa_1046.dll" "$INSTDIR"     
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afseventmsg_1046.dll"          "$INSTDIR\Common\afseventmsg_1046.dll" "$INSTDIR"     
+  ;!insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afs_setup_utils_1046.dll"      "$INSTDIR\Common\afs_setup_utils_1046.dll" "$INSTDIR"     
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afsserver_1046.dll"            "$INSTDIR\Common\afsserver_1046.dll" "$INSTDIR"     
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afssvrcfg_1046.dll"            "$INSTDIR\Common\afssvrcfg_1046.dll" "$INSTDIR"     
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_1046.dll"  "$INSTDIR\Common\TaAfsAccountManager_1046.dll" "$INSTDIR"     
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_1046.dll"          "$INSTDIR\Common\TaAfsAppLib_1046.dll" "$INSTDIR"     
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_1046.dll"   "$INSTDIR\Common\TaAfsServerManager_1046.dll" "$INSTDIR"     
    File "..\..\doc\help\pt_BR\afs-cc.CNT"
    File "..\..\doc\help\pt_BR\afs-cc.hlp"
    File "..\..\doc\help\pt_BR\afs-light.CNT"
@@ -2866,23 +2866,23 @@ DoSimpChinese:
    File "..\..\doc\install\Documentation\zh_CN\README.TXT"
 
    SetOutPath "$INSTDIR\Client\Program"
-   File "${AFS_CLIENT_BUILDDIR}\afscreds_2052.dll"
-  !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_2052.dll" "$INSTDIR\Client\Program\afs_shl_ext_2052.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afscreds_2052.dll"   "$INSTDIR\Client\Program\afscreds_2052.dll" "$INSTDIR"     
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_2052.dll" "$INSTDIR\Client\Program\afs_shl_ext_2052.dll" "$INSTDIR"
 !ifdef DEBUG
    ;File "${AFS_CLIENT_BUILDDIR}\afscreds_2052.pdb"
    ;File "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_2052.pdb"
 !endif
 
    SetOutPath "$INSTDIR\Common"
-   File "${AFS_CLIENT_BUILDDIR}\afs_config_2052.dll"
-   File "${AFS_CLIENT_BUILDDIR}\afs_cpa_2052.dll"
-   File "${AFS_SERVER_BUILDDIR}\afseventmsg_2052.dll"
-   ;File "${AFS_SERVER_BUILDDIR}\afs_setup_utils_2052.dll"
-   File "${AFS_SERVER_BUILDDIR}\afsserver_2052.dll"
-   File "${AFS_SERVER_BUILDDIR}\afssvrcfg_2052.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_2052.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_2052.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_2052.dll"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_config_2052.dll"           "$INSTDIR\Common\afs_config_2052.dll" "$INSTDIR"      
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_cpa_2052.dll"              "$INSTDIR\Common\afs_cpa_2052.dll" "$INSTDIR"      
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afseventmsg_2052.dll"          "$INSTDIR\Common\afseventmsg_2052.dll" "$INSTDIR"      
+  ;!insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afs_setup_utils_2052.dll"      "$INSTDIR\Common\afs_setup_utils_2052.dll" "$INSTDIR"      
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afsserver_2052.dll"            "$INSTDIR\Common\afsserver_2052.dll" "$INSTDIR"      
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afssvrcfg_2052.dll"            "$INSTDIR\Common\afssvrcfg_2052.dll" "$INSTDIR"      
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_2052.dll"  "$INSTDIR\Common\TaAfsAccountManager_2052.dll" "$INSTDIR"      
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_2052.dll"          "$INSTDIR\Common\TaAfsAppLib_2052.dll" "$INSTDIR"      
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_2052.dll"   "$INSTDIR\Common\TaAfsServerManager_2052.dll" "$INSTDIR"      
    File "..\..\doc\help\zh_CN\afs-cc.CNT"
    File "..\..\doc\help\zh_CN\afs-cc.hlp"
    File "..\..\doc\help\zh_CN\afs-light.CNT"
@@ -2914,23 +2914,23 @@ DoTradChinese:
    File "..\..\doc\install\Documentation\zh_TW\README.TXT"
 
    SetOutPath "$INSTDIR\Client\Program"
-   File "${AFS_CLIENT_BUILDDIR}\afscreds_1028.dll"
-  !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1028.dll" "$INSTDIR\Client\Program\afs_shl_ext_1028.dll" "$INSTDIR"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afscreds_1028.dll"  "$INSTDIR\Client\Program\_1028.dll" "$INSTDIR"      
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1028.dll" "$INSTDIR\Client\Program\afs_shl_ext_1028.dll" "$INSTDIR"
 !ifdef DEBUG
    ;File "${AFS_CLIENT_BUILDDIR}\afscreds_1028.pdb"
    ;File "${AFS_CLIENT_BUILDDIR}\afs_shl_ext_1028.pdb"
 !endif
 
    SetOutPath "$INSTDIR\Common"
-   File "${AFS_CLIENT_BUILDDIR}\afs_config_1028.dll"
-   File "${AFS_CLIENT_BUILDDIR}\afs_cpa_1028.dll"
-   File "${AFS_SERVER_BUILDDIR}\afseventmsg_1028.dll"
-   ;File "${AFS_SERVER_BUILDDIR}\afs_setup_utils_1028.dll"
-   File "${AFS_SERVER_BUILDDIR}\afsserver_1028.dll"
-   File "${AFS_SERVER_BUILDDIR}\afssvrcfg_1028.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_1028.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_1028.dll"
-   File "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_1028.dll"
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_config_1028.dll"           "$INSTDIR\Common\afs_config_1028.dll" "$INSTDIR"       
+   !insertmacro UpgradeDLL "${AFS_CLIENT_BUILDDIR}\afs_cpa_1028.dll"              "$INSTDIR\Common\afs_cpa_1028.dll" "$INSTDIR"       
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afseventmsg_1028.dll"          "$INSTDIR\Common\afseventmsg_1028.dll" "$INSTDIR"       
+  ;!insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afs_setup_utils_1028.dll"      "$INSTDIR\Common\afs_setup_utils_1028.dll" "$INSTDIR"       
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afsserver_1028.dll"            "$INSTDIR\Common\afsserver_1028.dll" "$INSTDIR"       
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\afssvrcfg_1028.dll"            "$INSTDIR\Common\afssvrcfg_1028.dll" "$INSTDIR"       
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAccountManager_1028.dll"  "$INSTDIR\Common\TaAfsAccountManager_1028.dll" "$INSTDIR"       
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsAppLib_1028.dll"          "$INSTDIR\Common\TaAfsAppLib_1028.dll" "$INSTDIR"       
+   !insertmacro UpgradeDLL "${AFS_SERVER_BUILDDIR}\TaAfsServerManager_1028.dll"   "$INSTDIR\Common\TaAfsServerManager_1028.dll" "$INSTDIR"       
    File "..\..\doc\help\zh_TW\afs-cc.CNT"
    File "..\..\doc\help\zh_TW\afs-cc.hlp"
    File "..\..\doc\help\zh_TW\afs-light.CNT"