diff --git a/src/cpp.c b/src/cpp.c
index 78b26dbefe00e1592cb12647fe610c4ed8ff9ae7..11425bfcd95c51604f285be7dfeabb59df16e46e 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: cpp.c,v 1.60 2000/02/28 04:20:36 hubbe Exp $
+ * $Id: cpp.c,v 1.61 2000/03/09 16:46:03 jhs Exp $
  */
 #include "global.h"
 #include "language.h"
@@ -846,8 +846,8 @@ static void insert_current_date_as_string(struct cpp *this,
   time(&tmp2);
   buf=ctime(&tmp2);
 
-  PUSH_STRING0((p_wchar0 *)buf+19, 5, tmp);
   PUSH_STRING0((p_wchar0 *)buf+4, 6, tmp);
+  PUSH_STRING0((p_wchar0 *)buf+19, 5, tmp);
 }
 
 static void check_defined(struct cpp *this,
diff --git a/src/testsuite.in b/src/testsuite.in
index 3828a4ba5fc6b05bfdbbef79501bcda3f13bc2d5..80a69ae2e212a3b64ad8728bf1cb55eb7550bcf1 100644
--- a/src/testsuite.in
+++ b/src/testsuite.in
@@ -1,5 +1,5 @@
 dnl -*- Pike -*-
-test_true([["$Id: testsuite.in,v 1.283 2000/03/09 15:55:32 grubba Exp $"]]);
+test_true([["$Id: testsuite.in,v 1.284 2000/03/09 16:46:03 jhs Exp $"]]);
 
 cond([[all_constants()->_verify_internals]],
 [[
@@ -2803,7 +2803,15 @@ dnl]],17)
 test_true(intp(__LINE__))
 test_true(stringp(__FILE__))
 test_true(stringp(__DATE__))
+test_true([[ sscanf(__DATE__, "%3s %d %d", string m, int d, int y) == 3 &&
+	     search(({"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+		      "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}), m) != -1 &&
+	     intp(d) && d>0 && d<32 && intp(y) ]])
 test_true(stringp(__TIME__))
+test_true([[ sscanf(__TIME__, "%d:%d:%d", int h, int m, int s) == 3 &&
+	     intp(h) && intp(m) && intp(s) &&
+	     h>=0 && m>=0 && s>=0 &&
+	     h<24 && m<60 && s<61 ]])
 test_true(floatp(__VERSION__))
 test_true(intp(__MAJOR__))
 test_true(intp(__MINOR__))