diff --git a/Makefile.in b/Makefile.in
index cdd52e6a8..4a465892e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-export NMAP_VERSION = 4.21BETA1
+export NMAP_VERSION = 4.21ALPHA1
 NMAP_NAME= Nmap
 NMAP_URL= http://insecure.org
 NMAP_PLATFORM=@host@
diff --git a/docs/nmap.1 b/docs/nmap.1
index a8994881d..62e209d1e 100644
--- a/docs/nmap.1
+++ b/docs/nmap.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "NMAP" "1" "12/08/2006" "" "Nmap Reference Guide"
+.TH "NMAP" "1" "12/10/2006" "" "Nmap Reference Guide"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index 6417c1afe..b5d6a4c4f 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 4.20 ( http://insecure.org )
+Nmap 4.21ALPHA1 ( http://insecure.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc.
@@ -35,6 +35,11 @@ SERVICE/VERSION DETECTION:
   --version-light: Limit to most likely probes (intensity 2)
   --version-all: Try every single probe (intensity 9)
   --version-trace: Show detailed version scan activity (for debugging)
+SCRIPT SCAN:
+  -sC: equivalent to --script=safe,intrusive
+  --script=<lua scripts>: <lua scripts> is a comma separated list of dirs or scripts
+  --script-trace: Show all data sent and received
+  --script-updatedb: Update the script database. Only performed if -sC or --script was also given.
 OS DETECTION:
   -O: Enable OS detection (try 2nd generation w/fallback to 1st)
   -O2: Only use the new OS detection system (no fallback)
diff --git a/mswin32/nmap.vcproj b/mswin32/nmap.vcproj
index cd3e0c133..997893b6b 100644
--- a/mswin32/nmap.vcproj
+++ b/mswin32/nmap.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="nmap"
 	ProjectGUID="{361719F0-AB42-4C93-9DE8-7D2144B96625}"
 	RootNamespace="nmap"
@@ -293,6 +293,10 @@
 				RelativePath="..\nse_pcrelib.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\nse_string.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\osscan.cc"
 				>
@@ -474,6 +478,10 @@
 				RelativePath="..\nse_pcrelib.h"
 				>
 			</File>
+			<File
+				RelativePath="..\nse_string.h"
+				>
+			</File>
 			<File
 				RelativePath="..\osscan.h"
 				>
diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi
index 379b91952..b6074a20f 100644
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@@ -62,7 +62,6 @@ Section "Nmap Core Files" SecCore
   File ..\..\nmap-services
   File ..\Release\nmap.exe
   File ..\..\docs\nmap.xsl
-	File ..\..\docs\nmap-nse-man.xml
   File ..\nmap_performance.reg
   File ..\..\README-WIN32
   File /r ..\..\scripts
diff --git a/nmap_winconfig.h b/nmap_winconfig.h
index d00114da8..ab09fa72d 100644
--- a/nmap_winconfig.h
+++ b/nmap_winconfig.h
@@ -106,7 +106,7 @@
 /* Without this, Windows will give us all sorts of crap about using functions
    like strcpy() even if they are done safely */
 #define _CRT_SECURE_NO_DEPRECATE 1
-#define NMAP_VERSION "4.21BETA1"
+#define NMAP_VERSION "4.21ALPHA1"
 #define NMAP_NAME "Nmap"
 #define NMAP_URL "http://insecure.org"
 #define NMAP_PLATFORM "i686-pc-windows-windows"
diff --git a/nse_auxiliar.cc b/nse_auxiliar.cc
index a05ed055a..5c12c2c77 100644
--- a/nse_auxiliar.cc
+++ b/nse_auxiliar.cc
@@ -7,6 +7,7 @@
 *
 * RCS ID: $Id: auxiliar.c,v 1.14 2005/10/07 04:40:59 diego Exp $
 \*=========================================================================*/
+#include "nmap_winconfig.h"
 #include <string.h>
 #include <stdio.h>
 
diff --git a/nse_auxiliar.h b/nse_auxiliar.h
index 518081b2f..07a3ee618 100644
--- a/nse_auxiliar.h
+++ b/nse_auxiliar.h
@@ -32,6 +32,9 @@
 * RCS ID: $Id: auxiliar.h,v 1.9 2005/10/07 04:40:59 diego Exp $
 \*=========================================================================*/
 
+#include "nmap_winconfig.h"
+#include "nbase.h"
+
 extern "C" {
 #include "lua.h"
 #include "lualib.h"