diff --git a/ANNOUNCE b/ANNOUNCE
index 30a3ca44..8d74bc20 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -112,6 +112,7 @@ version 1.2.41beta12 [November 2, 2009]
 version 1.2.41beta13 [November 2, 2009]
   Updated scripts/pngw32.def
   Patched ltmain.sh for wince support.
+  Added PNG_CONVERT_tIME_SUPPORTED macro.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 
diff --git a/CHANGES b/CHANGES
index d035d36c..065f8cb3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2542,6 +2542,7 @@ version 1.2.41beta12 [November 2, 2009]
 version 1.2.41beta13 [November 2, 2009]
   Updated scripts/pngw32.def
   Patched ltmain.sh for wince support.
+  Added PNG_CONVERT_tIME_SUPPORTED macro.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/png.h b/png.h
index 50bba37c..97e7af17 100644
--- a/png.h
+++ b/png.h
@@ -1651,18 +1651,15 @@ extern PNG_EXPORT(png_charp,png_convert_to_rfc1123)
    PNGARG((png_structp png_ptr, png_timep ptime));
 #endif
 
-#ifdef PNG_WRITE_tIME_SUPPORTED
+#ifdef PNG_CONVERT_tIME_SUPPORTED
 /* Convert from a struct tm to png_time */
-#  ifndef _WIN32_WCE
-/* "tm" structure is not supported on WindowsCE */
 extern PNG_EXPORT(void,png_convert_from_struct_tm) PNGARG((png_timep ptime,
    struct tm FAR * ttime));
 
 /* Convert from time_t to png_time.  Uses gmtime() */
 extern PNG_EXPORT(void,png_convert_from_time_t) PNGARG((png_timep ptime,
    time_t ttime));
-#  endif /* _WIN32_WCE */
-#endif /* PNG_WRITE_tIME_SUPPORTED */
+#endif /* PNG_CONVERT_tIME_SUPPORTED */
 
 #ifdef PNG_READ_EXPAND_SUPPORTED
 /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
diff --git a/pngconf.h b/pngconf.h
index be6bc1fa..fd6520f0 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1162,6 +1162,15 @@
 #  endif
 #endif
 
+#ifndef PNG_NO_CONVERT_tIME
+# ifndef _WIN32_WCE
+/* The "tm" structure is not supported on WindowsCE */
+#  ifndef PNG_CONVERT_tIME_SUPPORTED
+#    define PNG_CONVERT_tIME_SUPPORTED
+#   endif
+# endif
+#endif
+
 #endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */
 
 #if !defined(PNG_NO_WRITE_FILTER) && !defined(PNG_WRITE_FILTER_SUPPORTED)