diff --git a/CHANGELOG b/CHANGELOG
index 09183e775..0d20e5a71 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,12 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
 o Nmap's output options (-oA, -oX, etc.) now support strftime()-like
-  conversions in the filename.  %H, %M, %S, %T, %R, %m, %d, %y, and
-  %Y are all the same as in strftime().  %t is the same as %H%M%S,
-  %r is the same as %H%M, and %D is the same as %m%d%y.  This means
-  that "-oX 'scan-%T-%D.xml'" uses an XML file in the form of
-  "scan-14:48:40-121307.xml". [Kris]
+  conversions in the filename.  %H, %M, %S, %m, %d, %y, and %Y are
+  all the same as in strftime().  %T is the same as %H%M%S, %R is the
+  same as %H%M, and %D is the same as %m%d%y.  A % followed by any
+  other character just yields that character (%% yields a %).  This
+  means that "-oX 'scan-%T-%D.xml'" uses an XML file in the form of
+  "scan-144840-121307.xml". [Kris]
 
 4.50
 
diff --git a/docs/refguide.xml b/docs/refguide.xml
index e73787c68..cca410c0e 100644
--- a/docs/refguide.xml
+++ b/docs/refguide.xml
@@ -2870,15 +2870,15 @@ respectively.</para>
 
 <para>All of these arguments support <function>strftime()</function>-like
 conversions in the filename.  <literal>%H</literal>, <literal>%M</literal>,
-<literal>%S</literal>, <literal>%T</literal>, <literal>%R</literal>,
-<literal>%m</literal>, <literal>%d</literal>, <literal>%y</literal>,
-and <literal>%Y</literal> are all exactly the same as in
-<function>strftime()</function>.  <literal>%t</literal> is the same as
-<literal>%H%M%S</literal>, <literal>%r</literal> is the same as
+<literal>%S</literal>, <literal>%m</literal>, <literal>%d</literal>,
+<literal>%y</literal>, and <literal>%Y</literal> are all exactly the same
+as in <function>strftime()</function>.  <literal>%T</literal> is the same
+as <literal>%H%M%S</literal>, <literal>%R</literal> is the same as
 <literal>%H%M</literal>, and <literal>%D</literal> is the same as
-<literal>%m%d%y</literal>.  So <option>-oX 'scan-%T-%D.xml'</option>
-will use an XML file in the form of
-<filename>scan-14:48:40-121307.xml</filename>.</para>
+<literal>%m%d%y</literal>.  A <literal>%</literal> followed by any other
+character just yields that character (<literal>%%</literal> gives you a
+percent symbol).  So <option>-oX 'scan-%T-%D.xml'</option> will use an XML
+file in the form of <filename>scan-144840-121307.xml</filename>.</para>
 
 <para>Nmap also offers options to control scan verbosity and to append
 to output files rather than clobbering them.  All of these options are
diff --git a/output.cc b/output.cc
index 6221edaff..75f1efdf0 100644
--- a/output.cc
+++ b/output.cc
@@ -857,15 +857,9 @@ char *logfilename(const char *str, struct tm *tm)
 				strftime(tbuf, sizeof tbuf, "%S", tm);
 				break;
 			case 'T':
-				strftime(tbuf, sizeof tbuf, "%T", tm);
-				break;
-			case 't':
 				strftime(tbuf, sizeof tbuf, "%H%M%S", tm);
 				break;
 			case 'R':
-				strftime(tbuf, sizeof tbuf, "%R", tm);
-				break;
-			case 'r':
 				strftime(tbuf, sizeof tbuf, "%H%M", tm);
 				break;
 			case 'm':