diff --git a/docs/nmap-update.1 b/docs/nmap-update.1
index a63e27f9a..de2a392c2 100644
--- a/docs/nmap-update.1
+++ b/docs/nmap-update.1
@@ -2,12 +2,12 @@
.\" Title: nmap-update
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 03/01/2012
+.\" Date: 03/08/2012
.\" Manual: nmap-update Reference Guide
.\" Source: nmap-update
.\" Language: English
.\"
-.TH "NMAP\-UPDATE" "1" "03/01/2012" "nmap\-update" "nmap\-update Reference Guide"
+.TH "NMAP\-UPDATE" "1" "03/08/2012" "nmap\-update" "nmap\-update Reference Guide"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/nmap.1 b/docs/nmap.1
index 9cfb22980..7c2872064 100644
--- a/docs/nmap.1
+++ b/docs/nmap.1
@@ -2,12 +2,12 @@
.\" Title: nmap
.\" Author: [see the "Author" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 03/01/2012
+.\" Date: 03/08/2012
.\" Manual: Nmap Reference Guide
.\" Source: Nmap
.\" Language: English
.\"
-.TH "NMAP" "1" "03/01/2012" "Nmap" "Nmap Reference Guide"
+.TH "NMAP" "1" "03/08/2012" "Nmap" "Nmap Reference Guide"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -123,7 +123,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
.RS 4
.\}
.nf
-Nmap 5\&.61TEST4 ( http://nmap\&.org )
+Nmap 5\&.61TEST5 ( http://nmap\&.org )
Usage: nmap [Scan Type(s)] [Options] {target specification}
TARGET SPECIFICATION:
Can pass hostnames, IP addresses, networks, etc\&.
@@ -1576,6 +1576,15 @@ filtered
ports isn\*(Aqt worth the extra time\&.
.RE
.PP
+\fB\-\-nsock\-engine epoll|select\fR .\" --nsock-engine .\" Nsock IO engine
+.RS 4
+Enforce use of a given nsock IO multiplexing engine\&. Only the
+select(2)\-based fallback engine is guaranteed to be available on your system\&. Engines are named after the name of the IO management facility they leverage\&. Engines currenty implemented are
+epoll
+and
+select\&.
+.RE
+.PP
\fB\-T paranoid|sneaky|polite|normal|aggressive|insane\fR (Set a timing template) .\" -T .\" timing templates
.RS 4
.\" -T0
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index ebec77eb9..b285156da 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 5.61TEST4 ( http://nmap.org )
+Nmap 5.61TEST5 ( http://nmap.org )
Usage: nmap [Scan Type(s)] [Options] {target specification}
TARGET SPECIFICATION:
Can pass hostnames, IP addresses, networks, etc.
diff --git a/docs/zenmap.1 b/docs/zenmap.1
index 1a13da411..79ad7e1a0 100644
--- a/docs/zenmap.1
+++ b/docs/zenmap.1
@@ -2,12 +2,12 @@
.\" Title: zenmap
.\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 03/01/2012
+.\" Date: 03/08/2012
.\" Manual: Zenmap Reference Guide
.\" Source: Zenmap
.\" Language: English
.\"
-.TH "ZENMAP" "1" "03/01/2012" "Zenmap" "Zenmap Reference Guide"
+.TH "ZENMAP" "1" "03/08/2012" "Zenmap" "Zenmap Reference Guide"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/ncat/docs/ncat.1 b/ncat/docs/ncat.1
index 3cce62dff..60c8069b6 100644
--- a/ncat/docs/ncat.1
+++ b/ncat/docs/ncat.1
@@ -2,12 +2,12 @@
.\" Title: Ncat
.\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 02/25/2012
+.\" Date: 03/08/2012
.\" Manual: Ncat Reference Guide
.\" Source: Ncat
.\" Language: English
.\"
-.TH "NCAT" "1" "02/25/2012" "Ncat" "Ncat Reference Guide"
+.TH "NCAT" "1" "03/08/2012" "Ncat" "Ncat Reference Guide"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@ Among Ncat\*(Aqs vast number of features there is the ability to chain Ncats tog
.RS 4
.\}
.nf
-Ncat 5\&.61TEST4 ( http://nmap\&.org/ncat )
+Ncat 5\&.61TEST5 ( http://nmap\&.org/ncat )
Usage: ncat [options] [hostname] [port]
Options taking a time assume seconds\&. Append \*(Aqms\*(Aq for milliseconds,
diff --git a/ncat/docs/ncat.usage.txt b/ncat/docs/ncat.usage.txt
index 9ed1a9730..cebcdab69 100644
--- a/ncat/docs/ncat.usage.txt
+++ b/ncat/docs/ncat.usage.txt
@@ -1,4 +1,4 @@
-Ncat 5.61TEST4 ( http://nmap.org/ncat )
+Ncat 5.61TEST5 ( http://nmap.org/ncat )
Usage: ncat [options] [hostname] [port]
Options taking a time assume seconds. Append 'ms' for milliseconds,
diff --git a/ncat/ncat.h b/ncat/ncat.h
index aede3735a..451bf3fbd 100644
--- a/ncat/ncat.h
+++ b/ncat/ncat.h
@@ -115,7 +115,7 @@
/* Ncat information for output, etc. */
#define NCAT_NAME "Ncat"
#define NCAT_URL "http://nmap.org/ncat"
-#define NCAT_VERSION "5.61TEST4"
+#define NCAT_VERSION "5.61TEST5"
#ifndef __GNUC__
#ifndef __attribute__
diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1
index e39cba5b6..6417f77db 100644
--- a/ndiff/docs/ndiff.1
+++ b/ndiff/docs/ndiff.1
@@ -2,12 +2,12 @@
.\" Title: ndiff
.\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 02/25/2012
+.\" Date: 03/08/2012
.\" Manual: User Commands
.\" Source: Ndiff
.\" Language: English
.\"
-.TH "NDIFF" "1" "02/25/2012" "Ndiff" "User Commands"
+.TH "NDIFF" "1" "03/08/2012" "Ndiff" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/nmap.h b/nmap.h
index c0fec28dc..22e6b4c65 100644
--- a/nmap.h
+++ b/nmap.h
@@ -231,11 +231,12 @@ void *realloc();
#ifndef NMAP_VERSION
/* Edit this definition only within the quotes, because it is read from this
file by the makefiles. */
-#define NMAP_VERSION "5.61TEST4"
-#define NMAP_NUM_VERSION "5.61.0.4"
+#define NMAP_VERSION "5.61TEST5"
+#define NMAP_NUM_VERSION "5.61.0.5"
#endif
-/* The version number of updates retrieved by the nmap-update program. It can be
- different (but should always be earlier) than NMAP_VERSION. */
+/* The version number of updates retrieved by the nmap-update
+ program. It can be different (but should always be the same or
+ earlier) than NMAP_VERSION. */
#define NMAP_UPDATE_CHANNEL "5.61TEST4"
/* User configurable #defines: */
diff --git a/nping/docs/nping.1 b/nping/docs/nping.1
index 9b1ff26b8..e071d6ba9 100644
--- a/nping/docs/nping.1
+++ b/nping/docs/nping.1
@@ -2,12 +2,12 @@
.\" Title: nping
.\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 02/25/2012
+.\" Date: 03/08/2012
.\" Manual: Nping Reference Guide
.\" Source: Nping
.\" Language: English
.\"
-.TH "NPING" "1" "02/25/2012" "Nping" "Nping Reference Guide"
+.TH "NPING" "1" "03/08/2012" "Nping" "Nping Reference Guide"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/nping/nping.h b/nping/nping.h
index 630d10bfb..708a6d97f 100644
--- a/nping/nping.h
+++ b/nping/nping.h
@@ -309,7 +309,7 @@
/* General tunable defines **************************************************/
#define NPING_NAME "Nping"
#define NPING_URL "http://nmap.org/nping"
-#define NPING_VERSION "0.5.61TEST4"
+#define NPING_VERSION "0.5.61TEST5"
#define DEFAULT_VERBOSITY VB_0
diff --git a/todo/nmap.txt b/todo/nmap.txt
index 529a4ceda..9a5a4cdad 100644
--- a/todo/nmap.txt
+++ b/todo/nmap.txt
@@ -14,6 +14,10 @@ o Make the release
==Things needed for next STABLE release go ABOVE THIS LINE==
+o We should probably remove the intl.dll mv command from
+ zenmap/install_scripts/windows/copy_and_compile.bat for the reasons
+ described at http://seclists.org/nmap-dev/2012/q1/430.
+
o [NSE] host.os should not just be a list of strings which can contain
human-readible strings and/or CPE info. It should probably be list
of host.os tables which can contain:
diff --git a/zenmap/share/zenmap/config/zenmap_version b/zenmap/share/zenmap/config/zenmap_version
index 61cb82510..66c14f587 100644
--- a/zenmap/share/zenmap/config/zenmap_version
+++ b/zenmap/share/zenmap/config/zenmap_version
@@ -1 +1 @@
-5.61TEST4
+5.61TEST5
diff --git a/zenmap/zenmapCore/Version.py b/zenmap/zenmapCore/Version.py
index 5d51399dd..05f7bd70a 100644
--- a/zenmap/zenmapCore/Version.py
+++ b/zenmap/zenmapCore/Version.py
@@ -1 +1 @@
-VERSION = "5.61TEST4"
+VERSION = "5.61TEST5"