diff --git a/Configure.h.in b/Configure.h.in
index b57b6989b3fbb6ae8f94d9cf903ded35e0ba4292..e3fa4c73470337fe0a7e456f41748e3eb8441265 100644
--- a/Configure.h.in
+++ b/Configure.h.in
@@ -88,11 +88,15 @@
 #endif
 
 /* Setup the export macro.  */
-#if defined(_WIN32) && @KWSYS_BUILD_SHARED@
-# if defined(@KWSYS_NAMESPACE@_EXPORTS)
-#  define @KWSYS_NAMESPACE@_EXPORT __declspec(dllexport)
-# else
-#  define @KWSYS_NAMESPACE@_EXPORT __declspec(dllimport)
+#if @KWSYS_BUILD_SHARED@
+# if defined(_WIN32) || defined(__CYGWIN__)
+#  if defined(@KWSYS_NAMESPACE@_EXPORTS)
+#   define @KWSYS_NAMESPACE@_EXPORT __declspec(dllexport)
+#  else
+#   define @KWSYS_NAMESPACE@_EXPORT __declspec(dllimport)
+#  endif
+# elif __GNUC__ >= 4
+#  define @KWSYS_NAMESPACE@_EXPORT __attribute__ ((visibility("default")))
 # endif
 #else
 # define @KWSYS_NAMESPACE@_EXPORT
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index cbfcf6492838ea138e7aa9ed1ead2bc2ceb3c2bc..f31719056435eaafd57518facdac33693b776952 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -12,10 +12,10 @@
 #=============================================================================
 
 # KWSys version date year component.  Format is CCYY.
-SET(KWSYS_DATE_STAMP_YEAR  2009)
+SET(KWSYS_DATE_STAMP_YEAR  2010)
 
 # KWSys version date month component.  Format is MM.
-SET(KWSYS_DATE_STAMP_MONTH 12)
+SET(KWSYS_DATE_STAMP_MONTH 01)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   16)
+SET(KWSYS_DATE_STAMP_DAY   06)