diff --git a/DynamicLoader.cxx b/DynamicLoader.cxx
index 672dee5aec10756bb6ff2c58cc8ce8c26c4eae97..ec3137db6ef49270076eb7a61479e58c53bc76e1 100644
--- a/DynamicLoader.cxx
+++ b/DynamicLoader.cxx
@@ -335,20 +335,13 @@ const char* DynamicLoader::LastError()
 #endif //_WIN32
 
 // ---------------------------------------------------------------
-// 4. Implementation for BeOS / Haiku
-#if defined __BEOS__ || defined(__HAIKU__)
+// 4. Implementation for BeOS
+#if defined __BEOS__
 
 #include <string.h> // for strerror()
 
-#ifdef __BEOS__
 #include <be/kernel/image.h>
 #include <be/support/Errors.h>
-#endif
-
-#ifdef __HAIKU__
-#include <os/kernel/image.h>
-#include <os/support/Errors.h>
-#endif
 
 #define DYNAMICLOADER_DEFINED 1
 
diff --git a/DynamicLoader.hxx.in b/DynamicLoader.hxx.in
index 7bead2f7f03bbc7c93bdd66585d3867f7b9ab43c..5910c528f24105576c27c7455d776f6bda6c6a3c 100644
--- a/DynamicLoader.hxx.in
+++ b/DynamicLoader.hxx.in
@@ -25,8 +25,6 @@
   #if MAC_OS_X_VERSION_MAX_ALLOWED < 1030
     #include <mach-o/dyld.h>
   #endif
-#elif defined(__HAIKU__)
-  #include <os/kernel/image.h>
 #elif defined(__BEOS__)
   #include <be/kernel/image.h>
 #endif
@@ -69,8 +67,6 @@ public:
   #else
     typedef void* LibraryHandle;
   #endif
-#elif defined(__HAIKU__)
-  typedef image_id LibraryHandle;
 #elif defined(__BEOS__)
   typedef image_id LibraryHandle;
 #else  // POSIX
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index e8dc3b28339d18455f60aec8b9752ed6a3318889..71f906f5938b8707b3fa6f3775460c6a17dcf328 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -4,7 +4,7 @@
 SET(KWSYS_DATE_STAMP_YEAR  2009)
 
 # KWSys version date month component.  Format is MM.
-SET(KWSYS_DATE_STAMP_MONTH 01)
+SET(KWSYS_DATE_STAMP_MONTH 02)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   09)
+SET(KWSYS_DATE_STAMP_DAY   03)