diff --git a/mswin32/winpcap/Upgrading-Instructions.txt b/mswin32/winpcap/Upgrading-Instructions.txt
index 0b92df119..f2cce4a2d 100644
--- a/mswin32/winpcap/Upgrading-Instructions.txt
+++ b/mswin32/winpcap/Upgrading-Instructions.txt
@@ -1,49 +1,64 @@
-How to upgrade nmap to a new winpcap release (2007)
+How to upgrade Nmap to a new WinPcap release (2007)
 ---------------------------------------------------
 
-1) Download the latest version of winpcap from www.winpcap.org and make a note of the version (E.G. 4.0)
+1) Download the latest version of WinPcap from www.winpcap.org and make
+   a note of the version (for example 4.0).
 
-2) Remove all instances of winpcap then install the new version
+2) Remove all instances of WinPcap (through Add/Remove Programs), then
+   install the new version.
 
-3) Copy the installed files from your system directory into the nmap winpcap directory.
-   The installed files at time of writing are npf.sys, Packet.dll, pthreadVC.dll,
-   WanPacket.dll, wpcap.dll and rpcapd.exe
+3) Copy the installed files into the mswin32/winpcap directory. The
+   installed files at time of writing are
 
-4) Open winpcap-install.nsi 
+        C:\Program Files\WinPcap\rpcapd.exe
+        C:\Windows\system32\Packet.dll
+        C:\Windows\system32\pthreadVC.dll
+        C:\Windows\system32\WanPacket.dll
+        C:\Windows\system32\wpcap.dll
+        C:\Windows\system32\drivers\npf.sys
+   
+4) Open winpcap-nmap.nsi.
+   4a) Change the version for the following lines:
 
-	4a) change the version for the following lines:
+        Name "winpcap-nmap-X.X"
+        OutFile "winpcap-nmap-X.X.exe
+        WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "DisplayName" "winpcap-nmap X.X"
 
-		Name "winpcap-nmap-X.X"
-		OutFile "winpcap-nmap-X.X.exe
-        	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "DisplayName" "winpcap-nmap X.X"
+  4b) Get the internal 'FileVersion' from wpcap.dll. Right-click on
+      wpcap.dll and select "Properties", then select the "Version" tab.
+      Copy the number there into this part of winpcap-nmap.nsi:
 
-	4b) Get the internal 'FileVersion' from wpcap.dll by looking at it's 
-            properties/version dialogue then set the following line to
-            that value
+        var /GLOBAL my_ver
+        StrCpy $my_ver "X.X.X.X"  <-- file version goes here
 
-		var /GLOBAL my_ver
-		StrCpy $my_ver "X.X.X.X"  <-- file version goes here
+5) Generate installer exe by compiling winpcap-nmap.nsi using the
+   running the command
+        makensis winpcap-nmap.nsi
+   makensis is part of the "Nullsoft Scriptable Install System" at
+   http://nsis.sourceforge.net/.
 
-5) Generate installer exe by compiling winpcap-nmap.nsi using the 'Nullsoft Scriptable
-   Install System' at http://nsis.sourceforge.net/.
+6) Give the installer a test, make sure the correct version appears in
+   the installer's name and in Add/Remove Programs. You may also want to
+   try installing it when it is already installed or an older version is
+   installed.
 
-6) Give the installer a test, make sure the correct version appears in the installers
-   name and in add/remove programs. You may also want to try installing it when it is
-   already installed or an older version is installed
+7) Open mswin32/nsis/Nmap.nsi and update the references to the winpcap
+   installer's name. You should only have to change the version number.
+   The section you need to look at starts like this:
+        Section "WinPcap X.X" SecWinPcap
 
-7) Open mswin32/nsis/Nmap.nsi and update the references to the winpcap installer's name.
-   You should only have to change the version number. The section you need to look at 
-   starts like this 'Section "WinPcap X.X" SecWinPcap'
+8) Download the WinPcap developer package
+   (http://www.winpcap.org/devel.htm) and replace all the files in
+   mswin32/lib/ with the new versions inside the package.
 
-8) Download winpcap developer package and replace all files in mswin32/lib/ with the new 
-   versions inside the package
+9) Build the Nmap installer. The best way to do this is to run "make" in
+   the mswin32 directory. This will build Nmap and run makensis for you.
+   Test the installer. You may want to try it with Nmap already
+   installed and with different versions installed. Also check that
+   everything appears in Add/Remove Programs correctly.
 
-9) Recompile Nmap.nsi in the same way as winpcap-nmap.nsi. Test it. You may want to try
-   it with nmap already installed and with different versions installed. Also check
-   everything appears in add/remove programs correctly
-
-10) Test nmap functionallity that uses winpcap. (E.G. Raw packet scans/raw packet pings
-   /traceroute) 
+10) Test Nmap functionallity that uses WinPcap (raw packet scans, raw
+   packet pings, traceroute).
 
 11) Sit back and have a cup of coffee, you deserve it :)