diff --git a/dmd/cond.c b/dmd/cond.c
index 791ba9fe1f..7e13e2c080 100644
--- a/dmd/cond.c
+++ b/dmd/cond.c
@@ -145,7 +145,7 @@ void VersionCondition::checkPredefined(Loc loc, const char *ident)
     // LDC
     "LLVM", "LDC", "LLVM64",
     "PPC", "PPC64",
-    "darwin",
+    "darwin","solaris","freebsd"
     };
 
     for (unsigned i = 0; i < sizeof(reserved) / sizeof(reserved[0]); i++)
diff --git a/gen/main.cpp b/gen/main.cpp
index 2b060423ae..ab67b8a483 100644
--- a/gen/main.cpp
+++ b/gen/main.cpp
@@ -541,6 +541,7 @@ int main(int argc, char** argv)
     {
         global.params.os = OSFreeBSD;
         VersionCondition::addPredefinedGlobalIdent("freebsd");
+        VersionCondition::addPredefinedGlobalIdent("FreeBSD");
         VersionCondition::addPredefinedGlobalIdent("Posix");
     }
     // solaris
@@ -548,6 +549,7 @@ int main(int argc, char** argv)
     {
         global.params.os = OSSolaris;
         VersionCondition::addPredefinedGlobalIdent("solaris");
+        VersionCondition::addPredefinedGlobalIdent("Solaris");
         VersionCondition::addPredefinedGlobalIdent("Posix");
     }
     // unsupported