diff --git a/Gemfile b/Gemfile
index 88009f3d..a42634e1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ gem 'prawn-table'
 gem 'haml-rails'
 gem 'kaminari'
 gem 'simple_form'
-gem 'inherited_resources', git: 'git://github.com/josevalim/inherited_resources.git', branch: 'rails-4-2'
+gem 'inherited_resources'
 gem 'localize_input', git: "git://github.com/bennibu/localize_input.git"
 gem 'daemons'
 gem 'twitter-bootstrap-rails', '~> 2.2.8'
diff --git a/Gemfile.lock b/Gemfile.lock
index d8144e89..13e21fda 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,17 +4,6 @@ GIT
   specs:
     localize_input (0.1.0)
 
-GIT
-  remote: git://github.com/josevalim/inherited_resources.git
-  revision: ff1c991307ff78cce98882b6986aeabbbcfd70c4
-  branch: rails-4-2
-  specs:
-    inherited_resources (1.5.1)
-      actionpack (>= 3.2, < 5)
-      has_scope (~> 0.6.0.rc)
-      railties (>= 3.2, < 5)
-      responders
-
 GIT
   remote: git://github.com/technoweenie/acts_as_versioned.git
   revision: 63b1fc8529d028fae632fe80ec0cb25df56cd76b
@@ -191,6 +180,11 @@ GEM
     i18n-spec (0.6.0)
       iso
     ice_cube (0.13.0)
+    inherited_resources (1.6.0)
+      actionpack (>= 3.2, < 5)
+      has_scope (~> 0.6.0.rc)
+      railties (>= 3.2, < 5)
+      responders
     interception (0.5)
     iso (0.2.1)
       i18n
@@ -499,7 +493,7 @@ DEPENDENCIES
   i18n-js (~> 3.0.0.rc8)
   i18n-spec
   ice_cube (~> 0.13.0)
-  inherited_resources!
+  inherited_resources
   jquery-rails
   kaminari
   less-rails