diff --git a/mswin32/winpcap/Upgrading-Instructions.txt b/mswin32/winpcap/Upgrading-Instructions.txt
index 06f1dcdca..0b92df119 100644
--- a/mswin32/winpcap/Upgrading-Instructions.txt
+++ b/mswin32/winpcap/Upgrading-Instructions.txt
@@ -46,3 +46,6 @@ How to upgrade nmap to a new winpcap release (2007)
    /traceroute) 
 
 11) Sit back and have a cup of coffee, you deserve it :)
+
+
+*NB* You must also update vista/Packet.dll with the vista specific version from the offcial winpcap release
diff --git a/mswin32/winpcap/vista/Packet.dll b/mswin32/winpcap/vista/Packet.dll
new file mode 100644
index 000000000..c8a2c4a2f
Binary files /dev/null and b/mswin32/winpcap/vista/Packet.dll differ
diff --git a/mswin32/winpcap/winpcap-nmap.nsi b/mswin32/winpcap/winpcap-nmap.nsi
index 3ae8e5dbe..12303cec2 100644
--- a/mswin32/winpcap/winpcap-nmap.nsi
+++ b/mswin32/winpcap/winpcap-nmap.nsi
@@ -102,23 +102,34 @@ Section "" ;No components page, name is not important
 
   SetOutPath $SYSDIR
 
-  File Packet.dll
   File pthreadVC.dll
-  File WanPacket.dll
   File wpcap.dll
 
-  SetOutPath $SYSDIR\drivers
+  ; Check windows version
+  ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" VersionNumber
+  StrCmp $R0 '6.0'vista_files no_vista_files
 
-  File npf.sys
+  no_vista_files:
+    File Packet.dll
+    File WanPacket.dll
+    Goto install
 
-  ; Install some basic registry keys
-  WriteRegStr HKLM "Software\WinPcap" "" '"$INSTDIR"'
+  vista_files:
+    File vista\Packet.dll
 
-  ; Write the uninstall keys for Windows
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "DisplayName" "winpcap-nmap 4.01"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "UninstallString" '"$INSTDIR\uninstall.exe"'
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "NoModify" 1
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "NoRepair" 1
+  install:
+    SetOutPath $SYSDIR\drivers
+
+    File npf.sys
+
+    ; Install some basic registry keys
+    WriteRegStr HKLM "Software\WinPcap" "" '"$INSTDIR"'
+
+    ; Write the uninstall keys for Windows
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "DisplayName" "winpcap-nmap 4.01"
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "UninstallString" '"$INSTDIR\uninstall.exe"'
+    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "NoModify" 1
+    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "NoRepair" 1
 
 SectionEnd ; end the section