diff --git a/Gemfile b/Gemfile
index ec4f3d696..56c042a51 100644
--- a/Gemfile
+++ b/Gemfile
@@ -188,7 +188,7 @@ gem 'lru_redux'
 #  If you want to amend mini profiler to do the monkey patches in the railstie
 #  we are open to it. by deferring require to the initializer we can configure disourse installs without it
 
-gem 'flamegraph', require: false
+gem 'flamegraph', git: 'https://github.com/SamSaffron/flamegraph.git', require: false
 gem 'rack-mini-profiler',  git: 'https://github.com/MiniProfiler/rack-mini-profiler.git', require: false
 
 # used for caching, optional
diff --git a/Gemfile.lock b/Gemfile.lock
index 65c879e4b..c48647492 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,6 +37,13 @@ GIT
       activerecord (>= 2.3.0)
       rake (>= 0.8.7)
 
+GIT
+  remote: https://github.com/SamSaffron/flamegraph.git
+  revision: 07bd0ffdfd352e2fceb4edaf281990ba99156355
+  specs:
+    flamegraph (0.0.5)
+      fast_stack
+
 GIT
   remote: https://github.com/SamSaffron/message_bus
   revision: c357cbfea34eec3cca8f00754eb9d5bd2be98594
@@ -201,8 +208,6 @@ GEM
     fast_xs (0.8.0)
     fastimage (1.3.0)
     ffi (1.8.1)
-    flamegraph (0.0.4)
-      fast_stack
     fog (1.14.0)
       builder
       excon (~> 0.25.0)
@@ -489,7 +494,7 @@ DEPENDENCIES
   fast_xor!
   fast_xs
   fastimage
-  flamegraph
+  flamegraph!
   fog
   handlebars-source (= 1.0.12)
   highline
diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock
index 0d771f173..1f85f118f 100644
--- a/Gemfile_rails4.lock
+++ b/Gemfile_rails4.lock
@@ -89,13 +89,6 @@ GIT
       rake
       rake-compiler
 
-GIT
-  remote: https://github.com/MiniProfiler/rack-mini-profiler.git
-  revision: 292cb226b37ab58200f06aaa3cbe165dc25e7cc9
-  specs:
-    rack-mini-profiler (0.1.31)
-      rack (>= 1.1.3)
-
 GIT
   remote: https://github.com/SamSaffron/annotate_models.git
   revision: ebe4ba7e3f6ceeb43e4e40078da2b261a1bb71b2
@@ -104,6 +97,13 @@ GIT
       activerecord (>= 2.3.0)
       rake (>= 0.8.7)
 
+GIT
+  remote: https://github.com/SamSaffron/flamegraph.git
+  revision: 07bd0ffdfd352e2fceb4edaf281990ba99156355
+  specs:
+    flamegraph (0.0.5)
+      fast_stack
+
 GIT
   remote: https://github.com/SamSaffron/message_bus
   revision: 09392967940daf77943d1489ed3f1f71d6f8450a
@@ -146,6 +146,12 @@ GIT
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
 
+PATH
+  remote: /Users/sam/Source/rack-mini-profiler
+  specs:
+    rack-mini-profiler (0.1.31)
+      rack (>= 1.1.3)
+
 PATH
   remote: vendor/gems/discourse_emoji
   specs:
@@ -229,8 +235,6 @@ GEM
     fast_xs (0.8.0)
     fastimage (1.5.0)
     ffi (1.9.0)
-    flamegraph (0.0.4)
-      fast_stack
     fog (1.14.0)
       builder
       excon (~> 0.25.0)
@@ -494,7 +498,7 @@ DEPENDENCIES
   fast_xor!
   fast_xs
   fastimage
-  flamegraph
+  flamegraph!
   fog
   handlebars-source (= 1.0.12)
   highline