diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi
index 64deb5dde..6240d4e20 100644
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@@ -140,6 +140,16 @@ Section "Nmap Core Files" SecCore
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Nmap" "DisplayIcon" '"$INSTDIR\icon1.ico"' 
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Nmap" "NoModify" 1 
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Nmap" "NoRepair" 1 
+
+  ;Register .usr files with umit
+  ;This is commented out till umit supports opening log files from the command-line
+  ;WriteRegStr HKCR ".usr" "" "UmitScan"
+  ;WriteRegStr HKCR "UmitScan" "" "Umit Saved Port Scan"
+  ;WriteRegStr HKCR "UmitScan\DefaultIcon" "" "$INSTDIR\umit_128.ico,0"
+  ;WriteRegStr HKCR "UmitScan\shell\open\command" "" '"$INSTDIR\umit.exe" "%1"'
+  ;WriteRegStr HKCR "UmitScan\shell" "" "open"
+  ;System::Call 'Shell32::SHChangeNotify(i 0x8000000, i 0, i 0, i 0)'
+  
 SectionEnd 
  
 Section "Register Nmap Path" SecRegisterPath 
@@ -226,6 +236,12 @@ Section "Uninstall"
   Delete "$DESKTOP\Nmap - UMIT GUI.lnk"
   Delete "$SMPROGRAMS\Nmap\Nmap - UMIT GUI.lnk"
   RMDIR "$SMPROGRAMS\Nmap"
- 
+
+  ;Remove file association
+  ;This is commented out till umit supports opening log files from the command-line
+  ;DeleteRegKey HKCR ".usr"
+  ;DeleteRegKey HKCR "UmitScan"
+  ;System::Call 'Shell32::SHChangeNotify(i 0x8000000, i 0, i 0, i 0)'
+
   SetDetailsPrint both 
 SectionEnd