diff --git a/README.build b/README.build
index 338fd5195..16875d87e 100644
--- a/README.build
+++ b/README.build
@@ -25,8 +25,12 @@ Cygwin 1.7
 
 
 Haiku Alpha/R1
-  There are problems building task beta3 with Haiku that are not yet addressed.
-  This should be resolved before the release of task 1.9.0.
+  Task must be built with gcc version 4.x, so make sure you run:
+
+    $ setgcc gcc4
+
+  To switch from gcc 2.95 to gcc 4.x.
+
 
 
 Troubleshooting
diff --git a/src/Directory.cpp b/src/Directory.cpp
index d3ac2bc3d..02a55b844 100644
--- a/src/Directory.cpp
+++ b/src/Directory.cpp
@@ -122,7 +122,7 @@ void Directory::list (
           !strcmp (de->d_name, ".."))
         continue;
 
-#ifdef SOLARIS
+#if defined (SOLARIS) || defined (HAIKU)
       struct stat s;
       stat (de->d_name, &s);
       if (recursive && s.st_mode & S_IFDIR)