diff --git a/bin/systemlib.php b/bin/systemlib.php
index f2d777c23..350e8a5a0 100644
--- a/bin/systemlib.php
+++ b/bin/systemlib.php
@@ -2668,6 +2668,9 @@ interface MapAccess extends ConstMapAccess,
                             IndexAccess {
 }
 
+interface Indexish extends KeyedTraversable {
+}
+
 interface ConstVector extends ConstCollection,
                               ConstIndexAccess,
                               KeyedIterable {
diff --git a/hphp/system/class_map.cpp b/hphp/system/class_map.cpp
index 278ed5c3d..744055b1c 100644
--- a/hphp/system/class_map.cpp
+++ b/hphp/system/class_map.cpp
@@ -1266,7 +1266,7 @@ const int64_t k_PHP_URL_PORT = 2;
 const int64_t k_PHP_URL_QUERY = 6;
 const int64_t k_PHP_URL_SCHEME = 0;
 const int64_t k_PHP_URL_USER = 3;
-extern const StaticString k_PHP_VERSION("5.3.3.hiphop",12);
+extern const StaticString k_PHP_VERSION("5.4.999-hiphop",14);
 const int64_t k_PKCS7_BINARY = 128;
 const int64_t k_PKCS7_DETACHED = 64;
 const int64_t k_PKCS7_NOATTR = 256;
@@ -18735,7 +18735,7 @@ const char *g_class_map[] = {
   "PHP_URL_QUERY", (const char*)4, "i:6;",
   "PHP_URL_SCHEME", (const char*)4, "i:0;",
   "PHP_URL_USER", (const char*)4, "i:3;",
-  "PHP_VERSION", (const char*)20, "s:12:\"5.3.3.hiphop\";",
+  "PHP_VERSION", (const char*)22, "s:14:\"5.4.999-hiphop\";",
   "PKCS7_BINARY", (const char*)6, "i:128;",
   "PKCS7_DETACHED", (const char*)5, "i:64;",
   "PKCS7_NOATTR", (const char*)6, "i:256;",
diff --git a/hphp/system/globals/constdef.json b/hphp/system/globals/constdef.json
index 03f6fa12b..bafca5dea 100644
--- a/hphp/system/globals/constdef.json
+++ b/hphp/system/globals/constdef.json
@@ -4999,7 +4999,7 @@
         },
         {
             "name": "PHP_VERSION",
-            "value": "5.3.3.hiphop"
+            "value": "5.4.999-hiphop"
         },
         {
             "name": "PKCS7_BINARY",
diff --git a/hphp/test/test_ext_options.cpp b/hphp/test/test_ext_options.cpp
index fd82fd6f5..8c200cdba 100644
--- a/hphp/test/test_ext_options.cpp
+++ b/hphp/test/test_ext_options.cpp
@@ -360,7 +360,7 @@ bool TestExtOptions::test_phpinfo() {
 }
 
 bool TestExtOptions::test_phpversion() {
-  VS(f_phpversion(), "5.3.3.hiphop");
+  VS(f_phpversion(), "5.4.999-hiphop");
   return Count(true);
 }