diff --git a/smartmontools/CHANGELOG b/smartmontools/CHANGELOG
index dc1b824d5524807ab5295b024f19ae6667e2d50b..8dbcf7b165b349d6992ebceb007457ac68025830 100644
--- a/smartmontools/CHANGELOG
+++ b/smartmontools/CHANGELOG
@@ -43,6 +43,9 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [CF] configure.in: Change configure date syntax.
+       Add message to '-mno-cygwin' option check.
+
   [GK] Add names for some attributes used in MLC flash drives:
        175, 176, 177, 181, 182
 
diff --git a/smartmontools/configure.in b/smartmontools/configure.in
index 8154ae6f4e2383817d410b0f6ca37f882529918f..f07655375f8e1d2800d753ee1e42c55331de3855 100644
--- a/smartmontools/configure.in
+++ b/smartmontools/configure.in
@@ -6,7 +6,7 @@ AC_PREREQ(2.50)
 AC_INIT(smartmontools, 5.39, smartmontools-support@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(smartctl.cpp)
 
-smartmontools_configure_date=`date -u +"%Y/%m/%d %T %Z"`
+smartmontools_configure_date=`date -u +'%Y-%m-%d %T %Z'`
 smartmontools_cvs_tag=`echo '$Id$'`
 smartmontools_release_date=2008/03/10
 smartmontools_release_time="10:44:07 GMT"
@@ -38,13 +38,18 @@ case "${host}" in
 		# to select MinGW gcc. This does no longer work for gcc 4.x.
 		if test "${build}" = "${host}" && test -x /usr/bin/uname && \
 		   /usr/bin/uname | grep -i '^CYGWIN' >/dev/null; then
+		  AC_MSG_CHECKING([whether C and C++ compiler support -mno-cygwin])
+		  gcc_support_m_no_cygwin=no
 		  if $CC  -v -mno-cygwin >/dev/null 2>&1 && \
 		     $CXX -v -mno-cygwin >/dev/null 2>&1; then
-		    CPPFLAGS="$CPPFLAGS -mno-cygwin"
-		    LDFLAGS="$LDFLAGS -mno-cygwin"
-		  else
+		    gcc_support_m_no_cygwin=yes
+		  fi
+		  AC_MSG_RESULT([$gcc_support_m_no_cygwin])
+		  if test "$gcc_support_m_no_cygwin" != "yes"; then
 		    AC_MSG_ERROR([$CC and $CXX do not support -mno-cygwin, see INSTALL file for details.])
 		  fi
+		  CPPFLAGS="$CPPFLAGS -mno-cygwin"
+		  LDFLAGS="$LDFLAGS -mno-cygwin"
 		fi
 		CPPFLAGS="$CPPFLAGS -idirafter ${srcdir}/posix -idirafter ${srcdir}/os_win32"
 		;;