diff --git a/Gemfile b/Gemfile
index f8b5ac66d..0700fdcf5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -247,6 +247,8 @@ group :development do
 
   # test coverage
   gem "simplecov", "0.11.2", require: false
+
+  gem "turbo_dev_assets", "0.0.2"
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index f436a4569..1702c33a7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -732,6 +732,7 @@ GEM
       hitimes
     tins (1.6.0)
     trollop (2.1.2)
+    turbo_dev_assets (0.0.2)
     twitter (5.16.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
@@ -897,6 +898,7 @@ DEPENDENCIES
   spring-commands-rspec (= 1.0.4)
   test_after_commit (= 0.4.2)
   timecop (= 0.8.0)
+  turbo_dev_assets (= 0.0.2)
   twitter (= 5.16.0)
   twitter-text (= 1.13.3)
   typhoeus (= 0.8.0)
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 4ddeb92ca..2d00a9b03 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -37,4 +37,7 @@ Diaspora::Application.configure do
 
   # Show the logging configuration on STDOUT
   config.show_log_configuration = true
+
+  # Speed up asset serving
+  config.middleware.insert 0, TurboDevAssets
 end