diff --git a/CHANGELOG b/CHANGELOG
index 132823d9b..a5d9a3f1f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [Nping] The --safe-payloads option is now default. Added --include-payloads for special situations. [Colin Rice]
+
 o [NSE] Added the script reverse-index that creates creates a reverse index
   showing which hosts run a particular service rather than the services for
   each host. [Patrik]
diff --git a/todo/nmap.txt b/todo/nmap.txt
index fc364ad45..a161889f0 100644
--- a/todo/nmap.txt
+++ b/todo/nmap.txt
@@ -126,10 +126,6 @@ o We should probably modify stdnse.get_script_args so that it first
   [scriptname].[argname].
   o The code is in place now, we just need to document the feature.
 
-o [Nping] The --safe-payloads option should be default (though we
-  should keep it for backward compatability).  We could then introduce
-  --include-payloads for cases where they are desired.
-
 o Nmap Network Scanning, 2nd Edition work [placeholder]
 
 o Nscan work [placeholder]
@@ -714,6 +710,10 @@ o random tip database
 
 DONE:
 
+o [Nping] The --safe-payloads option should be default (though we
+  should keep it for backward compatability).  We could then introduce
+  --include-payloads for cases where they are desired.
+
 o A program to canonicalize and tidy nmap-service-probes.
   o Order of fields: m p v i d o h cpe:/a cpe:/h cpe:/o.
   o Check for duplicate templates (except cpe:).