diff --git a/Gemfile b/Gemfile
index 2aad97d6..3b24881a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,9 +46,7 @@ group :development do
   gem "spring-commands-cucumber"
   gem "yard"
 
-  # tolk is not completly migrated to rails 4 yet, so use master of AlexStein
-  # to get a working version 
-  gem 'tolk', github: 'tolk', ref: '60a207c0de'
+  gem 'tolk', '~> 1.6.0'
 
   gem "bullet"
   gem "rack-mini-profiler"
diff --git a/Gemfile.lock b/Gemfile.lock
index 44ca11f7..fb168eba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,3 @@
-GIT
-  remote: git://github.com/tolk/tolk.git
-  revision: 60a207c0dee2717a3c9baf752f2044768cc653cc
-  ref: 60a207c0de
-  specs:
-    tolk (1.5.2)
-      rails (>= 4.0, < 4.2)
-      safe_yaml (>= 0.8.6)
-      will_paginate
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -113,7 +103,7 @@ GEM
     metaclass (0.0.4)
     mime-types (1.25.1)
     mini_portile (0.6.0)
-    minitest (5.4.1)
+    minitest (5.4.2)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
@@ -154,7 +144,7 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-support (3.1.0)
     rubyzip (1.1.6)
-    safe_yaml (1.0.3)
+    safe_yaml (1.0.4)
     sanitize (3.0.2)
       crass (~> 0.2.0)
       nokogiri (>= 1.4.4)
@@ -197,6 +187,10 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
+    tolk (1.6.0)
+      rails (>= 4.0, < 4.2)
+      safe_yaml (>= 0.8.6)
+      will_paginate
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.5.3)
@@ -246,7 +240,7 @@ DEPENDENCIES
   sqlite3
   swf_fu
   therubyracer
-  tolk!
+  tolk (~> 1.6.0)
   uglifier (>= 1.3.0)
   will_paginate
   yard