diff --git a/Gemfile b/Gemfile
index 9035e2c037b..07ffce2b1a7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,8 +4,10 @@ gem 'active_model_serializers', git: 'https://github.com/rails-api/active_model_
 
 # we had issues with latest, stick to the rev till we figure this out
 # PR that makes it all hang together welcome
-gem 'ember-rails', git: 'https://github.com/emberjs/ember-rails.git', ref: '57bbe32'
-gem 'barber', '0.3.0'
+gem 'ember-rails'
+gem 'ember-source', '1.0.0.rc5' # or the version you need
+gem 'handlebars-source', '1.0.0.rc4' # or the version you need
+gem 'barber'
 
 gem 'vestal_versions', git: 'https://github.com/zhangyuan/vestal_versions'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5f302939bdc..56be9415eb6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,17 +53,6 @@ GIT
       multi_json
       omniauth (~> 1.0)
 
-GIT
-  remote: https://github.com/emberjs/ember-rails.git
-  revision: 57bbe3202725e55a8e4eaccba83d663b26bcf024
-  ref: 57bbe32
-  specs:
-    ember-rails (0.10.1)
-      active_model_serializers
-      barber
-      execjs (>= 1.2)
-      railties (>= 3.1)
-
 GIT
   remote: https://github.com/rails-api/active_model_serializers.git
   revision: fe84e0ad5268f1439123fd9a1f9fd12e25a54cd3
@@ -142,8 +131,10 @@ GEM
       activesupport
       builder
     arel (3.0.2)
-    barber (0.3.0)
+    barber (0.4.2)
+      ember-source
       execjs
+      handlebars-source
     better_errors (0.8.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -174,6 +165,13 @@ GEM
     diffy (2.1.4)
     em-redis (0.3.0)
       eventmachine
+    ember-rails (0.10.0)
+      active_model_serializers
+      barber
+      execjs (>= 1.2)
+      railties (>= 3.1)
+    ember-source (1.0.0.rc5)
+      handlebars-source (= 1.0.0.rc4)
     erubis (2.7.0)
     eventmachine (1.0.3)
     excon (0.20.1)
@@ -224,6 +222,7 @@ GEM
       spork (>= 0.8.4)
     haml (4.0.2)
       tilt
+    handlebars-source (1.0.0.rc4)
     has_ip_address (0.0.1)
     hashie (2.0.4)
     highline (1.6.18)
@@ -267,7 +266,7 @@ GEM
     minitest (4.7.3)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.7.2)
+    multi_json (1.7.6)
     multipart-post (1.2.0)
     mustache (0.99.4)
     net-scp (1.1.0)
@@ -483,7 +482,7 @@ DEPENDENCIES
   activerecord-postgres-hstore
   airbrake (= 3.1.2)
   annotate!
-  barber (= 0.3.0)
+  barber
   better_errors
   binding_of_caller
   certified
@@ -492,7 +491,8 @@ DEPENDENCIES
   discourse_emoji!
   discourse_plugin!
   em-redis
-  ember-rails!
+  ember-rails
+  ember-source (= 1.0.0.rc5)
   eventmachine
   fabrication
   fakeweb (~> 1.3.0)
@@ -505,6 +505,7 @@ DEPENDENCIES
   guard-jshint-on-rails
   guard-rspec
   guard-spork
+  handlebars-source (= 1.0.0.rc4)
   has_ip_address
   hiredis
   image_optim
diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars
index a9dbed82235..7ae7b70737a 100644
--- a/app/assets/javascripts/discourse/templates/header.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/header.js.handlebars
@@ -3,7 +3,6 @@
 
     {{view.logoHTML}}
 
-
     {{#if showExtraInfo}}
       <div class="extra-info-wrapper">
         <div class="extra-info">
diff --git a/config/environments/development.rb b/config/environments/development.rb
index e3d58cfef85..53c3d387528 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -30,7 +30,7 @@ Discourse::Application.configure do
   config.watchable_dirs['lib'] = [:rb]
 
   config.sass.debug_info = false
-  config.handlebars.precompile = false
+  config.handlebars.precompile = true
 
   # we recommend you use mailcatcher https://github.com/sj26/mailcatcher
   config.action_mailer.delivery_method = :smtp