diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog
index 1871c54..587ae4a 100644
--- a/mingw-w64-crt/ChangeLog
+++ b/mingw-w64-crt/ChangeLog
@@ -1,3 +1,12 @@
+2012-08-07  Kai Tietz  <ktietz@redhat.com>
+
+	* secapi/_ctime64_s.c: New file.
+	* secapi/_wctime64_s.c: New file.
+	* Makefile.am: Add new files.
+	* Makefile.in: Regenerated.
+	* lib32/msvcrt.def: Commented symbols.
+	* lib64/msvcrt.def: Likewise.
+
 2012-08-03  Kai Tietz  <ktietz@redhat.com>
 
 	* secapi/asctime_s.c: New file.
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index d49437c..7bc9e92 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -244,6 +244,7 @@
   secapi/_chsize_s.c secapi/_mktemp_s.c secapi/_wmktemp_s.c \
   secapi/_umask_s.c \
   secapi/_wctime32_s.c secapi/_ctime32_s.c \
+  secapi/_wctime64_s.c secapi/_ctime64_s.c \
   secapi/asctime_s.c secapi/_wasctime_s.c
 
 # these only go into the 64 bit version:
diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in
index 94051b5..dd92164 100644
--- a/mingw-w64-crt/Makefile.in
+++ b/mingw-w64-crt/Makefile.in
@@ -484,11 +484,12 @@
 	secapi/_vcwprintf_s.c secapi/_vcwprintf_s_l.c \
 	secapi/_access_s.c secapi/_waccess_s.c secapi/_chsize_s.c \
 	secapi/_mktemp_s.c secapi/_wmktemp_s.c secapi/_umask_s.c \
-	secapi/_wctime32_s.c secapi/_ctime32_s.c secapi/asctime_s.c \
-	secapi/_wasctime_s.c intrincs/membarrier.c \
-	intrincs/readfsbyte.c intrincs/readfsword.c \
-	intrincs/readfsdword.c intrincs/writefsbyte.c \
-	intrincs/writefsword.c intrincs/writefsdword.c
+	secapi/_wctime32_s.c secapi/_ctime32_s.c secapi/_wctime64_s.c \
+	secapi/_ctime64_s.c secapi/asctime_s.c secapi/_wasctime_s.c \
+	intrincs/membarrier.c intrincs/readfsbyte.c \
+	intrincs/readfsword.c intrincs/readfsdword.c \
+	intrincs/writefsbyte.c intrincs/writefsword.c \
+	intrincs/writefsdword.c
 am__objects_13 = crt/lib32_libmingwex_a-dllentry.$(OBJEXT) \
 	crt/lib32_libmingwex_a-dllmain.$(OBJEXT) \
 	complex/lib32_libmingwex_a-cabs.$(OBJEXT) \
@@ -998,6 +999,8 @@
 	secapi/lib32_libmingwex_a-_umask_s.$(OBJEXT) \
 	secapi/lib32_libmingwex_a-_wctime32_s.$(OBJEXT) \
 	secapi/lib32_libmingwex_a-_ctime32_s.$(OBJEXT) \
+	secapi/lib32_libmingwex_a-_wctime64_s.$(OBJEXT) \
+	secapi/lib32_libmingwex_a-_ctime64_s.$(OBJEXT) \
 	secapi/lib32_libmingwex_a-asctime_s.$(OBJEXT) \
 	secapi/lib32_libmingwex_a-_wasctime_s.$(OBJEXT)
 am__objects_14 = intrincs/lib32_libmingwex_a-membarrier.$(OBJEXT) \
@@ -1523,18 +1526,19 @@
 	secapi/_vcwprintf_s.c secapi/_vcwprintf_s_l.c \
 	secapi/_access_s.c secapi/_waccess_s.c secapi/_chsize_s.c \
 	secapi/_mktemp_s.c secapi/_wmktemp_s.c secapi/_umask_s.c \
-	secapi/_wctime32_s.c secapi/_ctime32_s.c secapi/asctime_s.c \
-	secapi/_wasctime_s.c intrincs/bittest64.c \
-	intrincs/bittestc64.c intrincs/bittestr64.c \
-	intrincs/bittestri64.c intrincs/bittests64.c \
-	intrincs/bittestsi64.c intrincs/bitscanfwd64.c \
-	intrincs/bitscanrev64.c intrincs/ilockadd64.c \
-	intrincs/readgsbyte.c intrincs/readgsword.c \
-	intrincs/readgsdword.c intrincs/readgsqword.c \
-	intrincs/writegsbyte.c intrincs/writegsword.c \
-	intrincs/writegsdword.c intrincs/writegsqword.c \
-	intrincs/mul128ex.c intrincs/umul128ex.c intrincs/_mul128.c \
-	intrincs/_umul128.c intrincs/__movsq.c intrincs/__stosq.c \
+	secapi/_wctime32_s.c secapi/_ctime32_s.c secapi/_wctime64_s.c \
+	secapi/_ctime64_s.c secapi/asctime_s.c secapi/_wasctime_s.c \
+	intrincs/bittest64.c intrincs/bittestc64.c \
+	intrincs/bittestr64.c intrincs/bittestri64.c \
+	intrincs/bittests64.c intrincs/bittestsi64.c \
+	intrincs/bitscanfwd64.c intrincs/bitscanrev64.c \
+	intrincs/ilockadd64.c intrincs/readgsbyte.c \
+	intrincs/readgsword.c intrincs/readgsdword.c \
+	intrincs/readgsqword.c intrincs/writegsbyte.c \
+	intrincs/writegsword.c intrincs/writegsdword.c \
+	intrincs/writegsqword.c intrincs/mul128ex.c \
+	intrincs/umul128ex.c intrincs/_mul128.c intrincs/_umul128.c \
+	intrincs/__movsq.c intrincs/__stosq.c \
 	intrincs/__shiftright128.c intrincs/__shiftleft128.c
 am__objects_38 = crt/lib64_libmingwex_a-dllentry.$(OBJEXT) \
 	crt/lib64_libmingwex_a-dllmain.$(OBJEXT) \
@@ -2045,6 +2049,8 @@
 	secapi/lib64_libmingwex_a-_umask_s.$(OBJEXT) \
 	secapi/lib64_libmingwex_a-_wctime32_s.$(OBJEXT) \
 	secapi/lib64_libmingwex_a-_ctime32_s.$(OBJEXT) \
+	secapi/lib64_libmingwex_a-_wctime64_s.$(OBJEXT) \
+	secapi/lib64_libmingwex_a-_ctime64_s.$(OBJEXT) \
 	secapi/lib64_libmingwex_a-asctime_s.$(OBJEXT) \
 	secapi/lib64_libmingwex_a-_wasctime_s.$(OBJEXT)
 am__objects_39 = intrincs/lib64_libmingwex_a-bittest64.$(OBJEXT) \
@@ -3511,6 +3517,7 @@
   secapi/_chsize_s.c secapi/_mktemp_s.c secapi/_wmktemp_s.c \
   secapi/_umask_s.c \
   secapi/_wctime32_s.c secapi/_ctime32_s.c \
+  secapi/_wctime64_s.c secapi/_ctime64_s.c \
   secapi/asctime_s.c secapi/_wasctime_s.c
 
 
@@ -5805,6 +5812,10 @@
 	secapi/$(am__dirstamp) secapi/$(DEPDIR)/$(am__dirstamp)
 secapi/lib32_libmingwex_a-_ctime32_s.$(OBJEXT):  \
 	secapi/$(am__dirstamp) secapi/$(DEPDIR)/$(am__dirstamp)
+secapi/lib32_libmingwex_a-_wctime64_s.$(OBJEXT):  \
+	secapi/$(am__dirstamp) secapi/$(DEPDIR)/$(am__dirstamp)
+secapi/lib32_libmingwex_a-_ctime64_s.$(OBJEXT):  \
+	secapi/$(am__dirstamp) secapi/$(DEPDIR)/$(am__dirstamp)
 secapi/lib32_libmingwex_a-asctime_s.$(OBJEXT): secapi/$(am__dirstamp) \
 	secapi/$(DEPDIR)/$(am__dirstamp)
 secapi/lib32_libmingwex_a-_wasctime_s.$(OBJEXT):  \
@@ -7290,6 +7301,10 @@
 	secapi/$(am__dirstamp) secapi/$(DEPDIR)/$(am__dirstamp)
 secapi/lib64_libmingwex_a-_ctime32_s.$(OBJEXT):  \
 	secapi/$(am__dirstamp) secapi/$(DEPDIR)/$(am__dirstamp)
+secapi/lib64_libmingwex_a-_wctime64_s.$(OBJEXT):  \
+	secapi/$(am__dirstamp) secapi/$(DEPDIR)/$(am__dirstamp)
+secapi/lib64_libmingwex_a-_ctime64_s.$(OBJEXT):  \
+	secapi/$(am__dirstamp) secapi/$(DEPDIR)/$(am__dirstamp)
 secapi/lib64_libmingwex_a-asctime_s.$(OBJEXT): secapi/$(am__dirstamp) \
 	secapi/$(DEPDIR)/$(am__dirstamp)
 secapi/lib64_libmingwex_a-_wasctime_s.$(OBJEXT):  \
@@ -9605,6 +9620,7 @@
 	-rm -f secapi/lib32_libmingwex_a-_cprintf_s.$(OBJEXT)
 	-rm -f secapi/lib32_libmingwex_a-_cprintf_s_l.$(OBJEXT)
 	-rm -f secapi/lib32_libmingwex_a-_ctime32_s.$(OBJEXT)
+	-rm -f secapi/lib32_libmingwex_a-_ctime64_s.$(OBJEXT)
 	-rm -f secapi/lib32_libmingwex_a-_cwprintf_s.$(OBJEXT)
 	-rm -f secapi/lib32_libmingwex_a-_cwprintf_s_l.$(OBJEXT)
 	-rm -f secapi/lib32_libmingwex_a-_mktemp_s.$(OBJEXT)
@@ -9616,6 +9632,7 @@
 	-rm -f secapi/lib32_libmingwex_a-_waccess_s.$(OBJEXT)
 	-rm -f secapi/lib32_libmingwex_a-_wasctime_s.$(OBJEXT)
 	-rm -f secapi/lib32_libmingwex_a-_wctime32_s.$(OBJEXT)
+	-rm -f secapi/lib32_libmingwex_a-_wctime64_s.$(OBJEXT)
 	-rm -f secapi/lib32_libmingwex_a-_wmktemp_s.$(OBJEXT)
 	-rm -f secapi/lib32_libmingwex_a-asctime_s.$(OBJEXT)
 	-rm -f secapi/lib64_libmingwex_a-_access_s.$(OBJEXT)
@@ -9625,6 +9642,7 @@
 	-rm -f secapi/lib64_libmingwex_a-_cprintf_s.$(OBJEXT)
 	-rm -f secapi/lib64_libmingwex_a-_cprintf_s_l.$(OBJEXT)
 	-rm -f secapi/lib64_libmingwex_a-_ctime32_s.$(OBJEXT)
+	-rm -f secapi/lib64_libmingwex_a-_ctime64_s.$(OBJEXT)
 	-rm -f secapi/lib64_libmingwex_a-_cwprintf_s.$(OBJEXT)
 	-rm -f secapi/lib64_libmingwex_a-_cwprintf_s_l.$(OBJEXT)
 	-rm -f secapi/lib64_libmingwex_a-_mktemp_s.$(OBJEXT)
@@ -9636,6 +9654,7 @@
 	-rm -f secapi/lib64_libmingwex_a-_waccess_s.$(OBJEXT)
 	-rm -f secapi/lib64_libmingwex_a-_wasctime_s.$(OBJEXT)
 	-rm -f secapi/lib64_libmingwex_a-_wctime32_s.$(OBJEXT)
+	-rm -f secapi/lib64_libmingwex_a-_wctime64_s.$(OBJEXT)
 	-rm -f secapi/lib64_libmingwex_a-_wmktemp_s.$(OBJEXT)
 	-rm -f secapi/lib64_libmingwex_a-asctime_s.$(OBJEXT)
 	-rm -f stdio/lib32_libmingwex_a-_Exit.$(OBJEXT)
@@ -11161,6 +11180,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmingwex_a-_cprintf_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmingwex_a-_cprintf_s_l.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmingwex_a-_ctime32_s.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmingwex_a-_ctime64_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmingwex_a-_cwprintf_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmingwex_a-_cwprintf_s_l.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmingwex_a-_mktemp_s.Po@am__quote@
@@ -11172,6 +11192,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmingwex_a-_waccess_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmingwex_a-_wasctime_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmingwex_a-_wctime32_s.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmingwex_a-_wctime64_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmingwex_a-_wmktemp_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmingwex_a-asctime_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmingwex_a-_access_s.Po@am__quote@
@@ -11181,6 +11202,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmingwex_a-_cprintf_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmingwex_a-_cprintf_s_l.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmingwex_a-_ctime32_s.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmingwex_a-_ctime64_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmingwex_a-_cwprintf_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmingwex_a-_cwprintf_s_l.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmingwex_a-_mktemp_s.Po@am__quote@
@@ -11192,6 +11214,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmingwex_a-_waccess_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmingwex_a-_wasctime_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmingwex_a-_wctime32_s.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmingwex_a-_wctime64_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmingwex_a-_wmktemp_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmingwex_a-asctime_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@stdio/$(DEPDIR)/lib32_libmingwex_a-_Exit.Po@am__quote@
@@ -20165,6 +20188,34 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib32_libmingwex_a-_ctime32_s.obj `if test -f 'secapi/_ctime32_s.c'; then $(CYGPATH_W) 'secapi/_ctime32_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/_ctime32_s.c'; fi`
 
+secapi/lib32_libmingwex_a-_wctime64_s.o: secapi/_wctime64_s.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib32_libmingwex_a-_wctime64_s.o -MD -MP -MF secapi/$(DEPDIR)/lib32_libmingwex_a-_wctime64_s.Tpo -c -o secapi/lib32_libmingwex_a-_wctime64_s.o `test -f 'secapi/_wctime64_s.c' || echo '$(srcdir)/'`secapi/_wctime64_s.c
+@am__fastdepCC_TRUE@	$(am__mv) secapi/$(DEPDIR)/lib32_libmingwex_a-_wctime64_s.Tpo secapi/$(DEPDIR)/lib32_libmingwex_a-_wctime64_s.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='secapi/_wctime64_s.c' object='secapi/lib32_libmingwex_a-_wctime64_s.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib32_libmingwex_a-_wctime64_s.o `test -f 'secapi/_wctime64_s.c' || echo '$(srcdir)/'`secapi/_wctime64_s.c
+
+secapi/lib32_libmingwex_a-_wctime64_s.obj: secapi/_wctime64_s.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib32_libmingwex_a-_wctime64_s.obj -MD -MP -MF secapi/$(DEPDIR)/lib32_libmingwex_a-_wctime64_s.Tpo -c -o secapi/lib32_libmingwex_a-_wctime64_s.obj `if test -f 'secapi/_wctime64_s.c'; then $(CYGPATH_W) 'secapi/_wctime64_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/_wctime64_s.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) secapi/$(DEPDIR)/lib32_libmingwex_a-_wctime64_s.Tpo secapi/$(DEPDIR)/lib32_libmingwex_a-_wctime64_s.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='secapi/_wctime64_s.c' object='secapi/lib32_libmingwex_a-_wctime64_s.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib32_libmingwex_a-_wctime64_s.obj `if test -f 'secapi/_wctime64_s.c'; then $(CYGPATH_W) 'secapi/_wctime64_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/_wctime64_s.c'; fi`
+
+secapi/lib32_libmingwex_a-_ctime64_s.o: secapi/_ctime64_s.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib32_libmingwex_a-_ctime64_s.o -MD -MP -MF secapi/$(DEPDIR)/lib32_libmingwex_a-_ctime64_s.Tpo -c -o secapi/lib32_libmingwex_a-_ctime64_s.o `test -f 'secapi/_ctime64_s.c' || echo '$(srcdir)/'`secapi/_ctime64_s.c
+@am__fastdepCC_TRUE@	$(am__mv) secapi/$(DEPDIR)/lib32_libmingwex_a-_ctime64_s.Tpo secapi/$(DEPDIR)/lib32_libmingwex_a-_ctime64_s.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='secapi/_ctime64_s.c' object='secapi/lib32_libmingwex_a-_ctime64_s.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib32_libmingwex_a-_ctime64_s.o `test -f 'secapi/_ctime64_s.c' || echo '$(srcdir)/'`secapi/_ctime64_s.c
+
+secapi/lib32_libmingwex_a-_ctime64_s.obj: secapi/_ctime64_s.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib32_libmingwex_a-_ctime64_s.obj -MD -MP -MF secapi/$(DEPDIR)/lib32_libmingwex_a-_ctime64_s.Tpo -c -o secapi/lib32_libmingwex_a-_ctime64_s.obj `if test -f 'secapi/_ctime64_s.c'; then $(CYGPATH_W) 'secapi/_ctime64_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/_ctime64_s.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) secapi/$(DEPDIR)/lib32_libmingwex_a-_ctime64_s.Tpo secapi/$(DEPDIR)/lib32_libmingwex_a-_ctime64_s.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='secapi/_ctime64_s.c' object='secapi/lib32_libmingwex_a-_ctime64_s.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib32_libmingwex_a-_ctime64_s.obj `if test -f 'secapi/_ctime64_s.c'; then $(CYGPATH_W) 'secapi/_ctime64_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/_ctime64_s.c'; fi`
+
 secapi/lib32_libmingwex_a-asctime_s.o: secapi/asctime_s.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib32_libmingwex_a-asctime_s.o -MD -MP -MF secapi/$(DEPDIR)/lib32_libmingwex_a-asctime_s.Tpo -c -o secapi/lib32_libmingwex_a-asctime_s.o `test -f 'secapi/asctime_s.c' || echo '$(srcdir)/'`secapi/asctime_s.c
 @am__fastdepCC_TRUE@	$(am__mv) secapi/$(DEPDIR)/lib32_libmingwex_a-asctime_s.Tpo secapi/$(DEPDIR)/lib32_libmingwex_a-asctime_s.Po
@@ -28803,6 +28854,34 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib64_libmingwex_a-_ctime32_s.obj `if test -f 'secapi/_ctime32_s.c'; then $(CYGPATH_W) 'secapi/_ctime32_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/_ctime32_s.c'; fi`
 
+secapi/lib64_libmingwex_a-_wctime64_s.o: secapi/_wctime64_s.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib64_libmingwex_a-_wctime64_s.o -MD -MP -MF secapi/$(DEPDIR)/lib64_libmingwex_a-_wctime64_s.Tpo -c -o secapi/lib64_libmingwex_a-_wctime64_s.o `test -f 'secapi/_wctime64_s.c' || echo '$(srcdir)/'`secapi/_wctime64_s.c
+@am__fastdepCC_TRUE@	$(am__mv) secapi/$(DEPDIR)/lib64_libmingwex_a-_wctime64_s.Tpo secapi/$(DEPDIR)/lib64_libmingwex_a-_wctime64_s.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='secapi/_wctime64_s.c' object='secapi/lib64_libmingwex_a-_wctime64_s.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib64_libmingwex_a-_wctime64_s.o `test -f 'secapi/_wctime64_s.c' || echo '$(srcdir)/'`secapi/_wctime64_s.c
+
+secapi/lib64_libmingwex_a-_wctime64_s.obj: secapi/_wctime64_s.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib64_libmingwex_a-_wctime64_s.obj -MD -MP -MF secapi/$(DEPDIR)/lib64_libmingwex_a-_wctime64_s.Tpo -c -o secapi/lib64_libmingwex_a-_wctime64_s.obj `if test -f 'secapi/_wctime64_s.c'; then $(CYGPATH_W) 'secapi/_wctime64_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/_wctime64_s.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) secapi/$(DEPDIR)/lib64_libmingwex_a-_wctime64_s.Tpo secapi/$(DEPDIR)/lib64_libmingwex_a-_wctime64_s.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='secapi/_wctime64_s.c' object='secapi/lib64_libmingwex_a-_wctime64_s.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib64_libmingwex_a-_wctime64_s.obj `if test -f 'secapi/_wctime64_s.c'; then $(CYGPATH_W) 'secapi/_wctime64_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/_wctime64_s.c'; fi`
+
+secapi/lib64_libmingwex_a-_ctime64_s.o: secapi/_ctime64_s.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib64_libmingwex_a-_ctime64_s.o -MD -MP -MF secapi/$(DEPDIR)/lib64_libmingwex_a-_ctime64_s.Tpo -c -o secapi/lib64_libmingwex_a-_ctime64_s.o `test -f 'secapi/_ctime64_s.c' || echo '$(srcdir)/'`secapi/_ctime64_s.c
+@am__fastdepCC_TRUE@	$(am__mv) secapi/$(DEPDIR)/lib64_libmingwex_a-_ctime64_s.Tpo secapi/$(DEPDIR)/lib64_libmingwex_a-_ctime64_s.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='secapi/_ctime64_s.c' object='secapi/lib64_libmingwex_a-_ctime64_s.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib64_libmingwex_a-_ctime64_s.o `test -f 'secapi/_ctime64_s.c' || echo '$(srcdir)/'`secapi/_ctime64_s.c
+
+secapi/lib64_libmingwex_a-_ctime64_s.obj: secapi/_ctime64_s.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib64_libmingwex_a-_ctime64_s.obj -MD -MP -MF secapi/$(DEPDIR)/lib64_libmingwex_a-_ctime64_s.Tpo -c -o secapi/lib64_libmingwex_a-_ctime64_s.obj `if test -f 'secapi/_ctime64_s.c'; then $(CYGPATH_W) 'secapi/_ctime64_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/_ctime64_s.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) secapi/$(DEPDIR)/lib64_libmingwex_a-_ctime64_s.Tpo secapi/$(DEPDIR)/lib64_libmingwex_a-_ctime64_s.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='secapi/_ctime64_s.c' object='secapi/lib64_libmingwex_a-_ctime64_s.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib64_libmingwex_a-_ctime64_s.obj `if test -f 'secapi/_ctime64_s.c'; then $(CYGPATH_W) 'secapi/_ctime64_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/_ctime64_s.c'; fi`
+
 secapi/lib64_libmingwex_a-asctime_s.o: secapi/asctime_s.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib64_libmingwex_a-asctime_s.o -MD -MP -MF secapi/$(DEPDIR)/lib64_libmingwex_a-asctime_s.Tpo -c -o secapi/lib64_libmingwex_a-asctime_s.o `test -f 'secapi/asctime_s.c' || echo '$(srcdir)/'`secapi/asctime_s.c
 @am__fastdepCC_TRUE@	$(am__mv) secapi/$(DEPDIR)/lib64_libmingwex_a-asctime_s.Tpo secapi/$(DEPDIR)/lib64_libmingwex_a-asctime_s.Po
diff --git a/mingw-w64-crt/lib32/msvcrt.def b/mingw-w64-crt/lib32/msvcrt.def
index 0c76fe1..6fdec27 100644
--- a/mingw-w64-crt/lib32/msvcrt.def
+++ b/mingw-w64-crt/lib32/msvcrt.def
@@ -823,7 +823,7 @@
 _cscanf_s
 _cscanf_s_l
 ; _ctime32_s replaced by eum
-_ctime64_s
+; _ctime64_s Likewise
 _cwprintf_l
 _cwprintf_p
 _cwprintf_p_l
@@ -1140,7 +1140,7 @@
 _wcsupr_s_l
 _wcsxfrm_l
 ; _wctime32_s replaced by emu
-_wctime64_s
+; _wctime64_s Likewise.
 _wctomb_l
 _wctomb_s_l
 _wfopen_s
diff --git a/mingw-w64-crt/lib64/msvcrt.def b/mingw-w64-crt/lib64/msvcrt.def
index 44ecb0a..8ba46e4 100644
--- a/mingw-w64-crt/lib64/msvcrt.def
+++ b/mingw-w64-crt/lib64/msvcrt.def
@@ -243,7 +243,7 @@
 _cscanf_s_l
 ; _ctime32_s replaced by emu
 _ctime64
-_ctime64_s
+; _ctime64_s replaced by emu
 _ctype
 _cwait
 _cwprintf
@@ -912,7 +912,7 @@
 ;_wctime32 = _wctime
 ; _wctime32_s replaced by emu
 _wctime64
-_wctime64_s
+; _wctime64_s replaced by emu
 _wctomb_l
 _wctomb_s_l
 _wctype
diff --git a/mingw-w64-crt/secapi/_ctime64_s.c b/mingw-w64-crt/secapi/_ctime64_s.c
new file mode 100644
index 0000000..0dadd96
--- /dev/null
+++ b/mingw-w64-crt/secapi/_ctime64_s.c
@@ -0,0 +1,59 @@
+#include <windows.h>
+#include <malloc.h>
+#include <time.h>
+#include <errno.h>
+
+HMODULE __mingw_get_msvcrt_handle (void);
+errno_t __cdecl _localtime64_s (struct tm *, const __time64_t *);
+errno_t __cdecl asctime_s (char *, size_t, const struct tm *);
+errno_t __cdecl _ctime64_s (char *, size_t, const __time64_t *);
+static errno_t __cdecl _int_ctime64_s (char *, size_t, const __time64_t *);
+static errno_t __cdecl _stub (char *, size_t, const __time64_t *);
+
+errno_t __cdecl (*__MINGW_IMP_SYMBOL(_ctime64_s))(char *, size_t, const __time64_t *) = 
+ _stub;
+
+static errno_t __cdecl
+_stub (char *d, size_t dn, const __time64_t *pt)
+{
+  errno_t __cdecl (*f)(char *, size_t, const __time64_t *) = __MINGW_IMP_SYMBOL(_ctime64_s);
+
+  if (f == _stub)
+    {
+	f = (errno_t __cdecl (*)(char *, size_t, const __time64_t *))
+	    GetProcAddress (__mingw_get_msvcrt_handle (), "_ctime64_s");
+	if (!f)
+	  f = _int_ctime64_s;
+	__MINGW_IMP_SYMBOL(_ctime64_s) = f;
+    }
+  return (*f)(d, dn, pt);
+}
+
+errno_t __cdecl
+_ctime64_s (char *d, size_t dn, const __time64_t *pt)
+{
+  return _stub (d, dn, pt);
+}
+
+static errno_t __cdecl
+_int_ctime64_s (char *d, size_t dn, const __time64_t *pt)
+{
+  struct tm ltm;
+  errno_t e;
+
+  if (!d || !dn)
+     {
+        errno = EINVAL;
+	return EINVAL;
+     }
+  d[0] = 0;
+  if (!pt)
+     {
+	errno = EINVAL;
+	return EINVAL;
+     }
+
+  if ((e = _localtime64_s (&ltm, pt)) != 0)
+    return e;  
+  return asctime_s (d, dn, &ltm);
+}
diff --git a/mingw-w64-crt/secapi/_wctime64_s.c b/mingw-w64-crt/secapi/_wctime64_s.c
new file mode 100644
index 0000000..daa43bc
--- /dev/null
+++ b/mingw-w64-crt/secapi/_wctime64_s.c
@@ -0,0 +1,59 @@
+#include <windows.h>
+#include <malloc.h>
+#include <time.h>
+#include <errno.h>
+
+HMODULE __mingw_get_msvcrt_handle (void);
+errno_t __cdecl _localtime64_s (struct tm *, const __time64_t *);
+errno_t __cdecl _wasctime_s (wchar_t *, size_t, const struct tm *);
+errno_t __cdecl _wctime64_s (wchar_t *, size_t, const __time64_t *);
+static errno_t __cdecl _int_wctime64_s (wchar_t *, size_t, const __time64_t *);
+static errno_t __cdecl _stub (wchar_t *, size_t, const __time64_t *);
+
+errno_t __cdecl (*__MINGW_IMP_SYMBOL(_wctime64_s))(wchar_t *, size_t, const __time64_t *) = 
+ _stub;
+
+static errno_t __cdecl
+_stub (wchar_t *d, size_t dn, const __time64_t *pt)
+{
+  errno_t __cdecl (*f)(wchar_t*,size_t, const __time64_t *) = __MINGW_IMP_SYMBOL(_wctime64_s);
+
+  if (f == _stub)
+    {
+	f = (errno_t __cdecl (*)(wchar_t *, size_t, const __time64_t *))
+	    GetProcAddress (__mingw_get_msvcrt_handle (), "_wctime64_s");
+	if (!f)
+	  f = _int_wctime64_s;
+	__MINGW_IMP_SYMBOL(_wctime64_s) = f;
+    }
+  return (*f)(d, dn, pt);
+}
+
+errno_t __cdecl
+_wctime64_s (wchar_t *d, size_t dn, const __time64_t *pt)
+{
+  return _stub (d, dn, pt);
+}
+
+static errno_t __cdecl
+_int_wctime64_s (wchar_t *d, size_t dn, const __time64_t *pt)
+{
+  struct tm ltm;
+  errno_t e;
+
+  if (!d || !dn)
+     {
+        errno = EINVAL;
+	return EINVAL;
+     }
+  d[0] = 0;
+  if (!pt)
+     {
+	errno = EINVAL;
+	return EINVAL;
+     }
+
+  if ((e = _localtime64_s (&ltm, pt)) != 0)
+    return e;  
+  return _wasctime_s (d, dn, &ltm);
+}
diff --git a/mingw-w64-headers/crt/sec_api/time_s.h b/mingw-w64-headers/crt/sec_api/time_s.h
index a0f58cc..b7f5893 100644
--- a/mingw-w64-headers/crt/sec_api/time_s.h
+++ b/mingw-w64-headers/crt/sec_api/time_s.h
@@ -20,7 +20,7 @@
   errno_t __cdecl asctime_s (char *_Buf,size_t _SizeInWords,const struct tm *_Tm);
   _CRTIMP errno_t __cdecl _strdate_s(char *_Buf,size_t _SizeInBytes);
   _CRTIMP errno_t __cdecl _strtime_s(char *_Buf ,size_t _SizeInBytes);
-  _CRTIMP errno_t __cdecl _ctime64_s(char *_Buf,size_t _SizeInBytes,const __time64_t *_Time);
+  errno_t __cdecl _ctime64_s (char *_Buf,size_t _SizeInBytes,const __time64_t *_Time);
   _CRTIMP errno_t __cdecl _gmtime64_s(struct tm *_Tm,const __time64_t *_Time);
   _CRTIMP errno_t __cdecl _localtime64_s(struct tm *_Tm,const __time64_t *_Time);
 
@@ -30,13 +30,13 @@
   errno_t __cdecl _wctime32_s (wchar_t *_Buf,size_t _SizeInWords,const __time32_t *_Time);
   _CRTIMP errno_t __cdecl _wstrdate_s(wchar_t *_Buf,size_t _SizeInWords);
   _CRTIMP errno_t __cdecl _wstrtime_s(wchar_t *_Buf,size_t _SizeInWords);
-  _CRTIMP errno_t __cdecl _wctime64_s(wchar_t *_Buf,size_t _SizeInWords,const __time64_t *_Time);
+  errno_t __cdecl _wctime64_s (wchar_t *_Buf,size_t _SizeInWords,const __time64_t *_Time);
 
 #if !defined (RC_INVOKED) && !defined (_INC_WTIME_S_INL)
 #define _INC_WTIME_S_INL
   errno_t __cdecl _wctime_s(wchar_t *, size_t, const time_t *);
 #ifndef _USE_32BIT_TIME_T
-__CRT_INLINE errno_t __cdecl _wctime_s(wchar_t *_Buffer,size_t _SizeInWords,const time_t *_Time) { return _wctime64_s(_Buffer,_SizeInWords,_Time); }
+__CRT_INLINE errno_t __cdecl _wctime_s (wchar_t *_Buffer,size_t _SizeInWords,const time_t *_Time) { return _wctime64_s (_Buffer,_SizeInWords,_Time); }
 #endif
 #endif
 #endif
diff --git a/mingw-w64-headers/crt/sec_api/wchar_s.h b/mingw-w64-headers/crt/sec_api/wchar_s.h
index b92b8db..dcf46b8 100644
--- a/mingw-w64-headers/crt/sec_api/wchar_s.h
+++ b/mingw-w64-headers/crt/sec_api/wchar_s.h
@@ -136,7 +136,7 @@
   errno_t __cdecl _wctime32_s (wchar_t *_Buf,size_t _SizeInWords,const __time32_t *_Time);
   _CRTIMP errno_t __cdecl _wstrdate_s(wchar_t *_Buf,size_t _SizeInWords);
   _CRTIMP errno_t __cdecl _wstrtime_s(wchar_t *_Buf,size_t _SizeInWords);
-  _CRTIMP errno_t __cdecl _wctime64_s(wchar_t *_Buf,size_t _SizeInWords,const __time64_t *_Time);
+  errno_t __cdecl _wctime64_s (wchar_t *_Buf,size_t _SizeInWords,const __time64_t *_Time);
 
 #if !defined (RC_INVOKED) && !defined (_INC_WTIME_S_INL)
 #define _INC_WTIME_S_INL