diff --git a/DynamicLoader.hxx.in b/DynamicLoader.hxx.in
index 5910c528f24105576c27c7455d776f6bda6c6a3c..a30ee6b64712a5f2aca1aac141b91b400c9e324d 100644
--- a/DynamicLoader.hxx.in
+++ b/DynamicLoader.hxx.in
@@ -25,6 +25,8 @@
   #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
diff --git a/ProcessUNIX.c b/ProcessUNIX.c
index 0ba5d06fbef53a6567058aa5e04390e190571cbb..b7526f12bed8a63c4faa6e7347d282ddf72a87b5 100644
--- a/ProcessUNIX.c
+++ b/ProcessUNIX.c
@@ -63,6 +63,10 @@ do.
 #include <dirent.h>    /* DIR, dirent */
 #include <ctype.h>     /* isspace */
 
+#ifdef __HAIKU__
+#undef __BEOS__
+#endif
+
 #if defined(KWSYS_C_HAS_PTRDIFF_T) && KWSYS_C_HAS_PTRDIFF_T
 typedef ptrdiff_t kwsysProcess_ptrdiff_t;
 #else
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index 7cdb123ee848adb8f317c16a2940ceee24ee69a2..32df8350d92b94fa5df377800c8fe418479d7200 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@ SET(KWSYS_DATE_STAMP_YEAR  2008)
 SET(KWSYS_DATE_STAMP_MONTH 09)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   15)
+SET(KWSYS_DATE_STAMP_DAY   22)
diff --git a/testProcess.c b/testProcess.c
index 11bef4275cb326710dfe6c58eb542109d75c908a..cde03e389506432c51ac94022c8c30e8c3b3b068 100644
--- a/testProcess.c
+++ b/testProcess.c
@@ -87,7 +87,7 @@ int test4(int argc, const char* argv[])
 #if defined(_WIN32)
   /* Avoid error diagnostic popups since we are crashing on purpose.  */
   SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
-#elif defined(__BEOS__)
+#elif defined(__BEOS__) || defined(__HAIKU__)
   /* Avoid error diagnostic popups since we are crashing on purpose.  */
   disable_debugger(1);
 #endif