diff --git a/Formula/hhvm-nightly.rb b/Formula/hhvm-nightly.rb
index 4b553035..34d37715 100644
--- a/Formula/hhvm-nightly.rb
+++ b/Formula/hhvm-nightly.rb
@@ -64,7 +64,7 @@ def optimization_flags
   depends_on "mcrypt"
   depends_on "oniguruma"
   depends_on "openssl"
-  depends_on "pcre"
+  # depends_on "pcre" # Need to investigate segfaults. Issue #116
   depends_on "postgresql"
   depends_on "sqlite"
   depends_on "tbb"
@@ -76,6 +76,11 @@ def install
       -DDEFAULT_CONFIG_DIR=#{etc}/hhvm
     ]
 
+    # Force use of bundled PCRE to workaround #116
+    cmake_args += %W[
+      -DSYSTEM_PCRE_HAS_JIT=0
+    ]
+
     # Features which don't work on OS X yet since they haven't been ported yet.
     cmake_args += %W[
       -DENABLE_MCROUTER=OFF