diff --git a/setter/src/beos/os.c b/setter/src/beos/os.c
index 706b60a..6211337 100644
--- a/setter/src/beos/os.c
+++ b/setter/src/beos/os.c
@@ -68,8 +68,13 @@ void GetOsInfo()
     else if(strncmp(buf.sysname, "Haiku", 5) == 0)
     {
         strncpy(version, buf.version, _SYS_NAMELEN);
-        version_date  = strchr(version, '+');
-        *version_date = '\0';
+        version_date = strchr(version, '+');
+        if(version_date) *version_date = '\0';
+        else
+        {
+            version_date = strchr(version, ' ');
+            if(version_date) *version_date = '\0';
+        }
 
         log_write("Running under Haiku %s\n", buf.version);
     }