diff --git a/include/llvm/ADT/Triple.h b/include/llvm/ADT/Triple.h
index 89736bcc456..7fb0014dc8a 100644
--- a/include/llvm/ADT/Triple.h
+++ b/include/llvm/ADT/Triple.h
@@ -95,7 +95,8 @@ public:
     NetBSD,
     OpenBSD,
     Solaris,
-    Win32
+    Win32,
+    Haiku
   };
   
 private:
diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp
index 6f805da3329..26a1a4e5829 100644
--- a/lib/Support/Triple.cpp
+++ b/lib/Support/Triple.cpp
@@ -96,6 +96,7 @@ const char *Triple::getOSTypeName(OSType Kind) {
   case OpenBSD: return "openbsd";
   case Solaris: return "solaris";
   case Win32: return "win32";
+  case Haiku: return "haiku";
   }
 
   return "<invalid>";
@@ -276,6 +277,8 @@ void Triple::Parse() const {
     OS = Solaris;
   else if (OSName.startswith("win32"))
     OS = Win32;
+  else if (OSName.startswith("haiku"))
+  	OS = Haiku;
   else
     OS = UnknownOS;