diff --git a/Gemfile b/Gemfile
index 80aa20e216..796284f297 100755
--- a/Gemfile
+++ b/Gemfile
@@ -3,8 +3,17 @@ source 'https://rubygems.org'
 #   spec.add_runtime_dependency '<name>', [<version requirements>]
 gemspec name: 'metasploit-framework'
 
+# TODO: Rails 4
+# move these back into the root gemspec
+gem 'metasploit-concern', :github => 'rapid7/metasploit-concern', :branch => 'staging/rails-4.0'
+gem 'metasploit-model', :github => 'rapid7/metasploit-model', :branch => 'staging/rails-4.0'
+
 group :db do
   gemspec name: 'metasploit-framework-db'
+  # TODO: Rails 4
+  # move these back into the metasploit-framework-db gemspec
+  gem 'metasploit-credential', :github => 'rapid7/metasploit-credential', :branch => 'staging/rails-4.0'
+  gem 'metasploit_data_models', :github => 'rapid7/metasploit_data_models', :branch => 'staging/rails-4.0'
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 8c89efa940..9efee721f5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -57,8 +57,6 @@ PATH
       bcrypt
       jsobfu (~> 0.2.0)
       json
-      metasploit-concern
-      metasploit-model
       meterpreter_bins (= 0.0.10)
       msgpack
       nokogiri
@@ -70,6 +68,14 @@ PATH
       rubyzip (~> 1.1)
       sqlite3
       tzinfo
+    metasploit-framework-db (4.10.1.pre.dev)
+      activerecord (>= 4.0.9, < 4.1.0)
+      metasploit-framework (= 4.10.1.pre.dev)
+      pg (>= 0.11)
+    metasploit-framework-pcap (4.10.1.pre.dev)
+      metasploit-framework (= 4.10.1.pre.dev)
+      network_interface (~> 0.0.1)
+      pcaprub
 
 GEM
   remote: https://rubygems.org/
@@ -159,7 +165,7 @@ GEM
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     packetfu (1.1.9)
-    pcaprub (0.11.3)
+    pcaprub (0.12.0)
     pg (0.17.1)
     pg_array_parser (0.0.9)
     postgres_ext (2.3.0)
@@ -232,7 +238,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.9)
+    sqlite3 (1.3.10)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
@@ -246,7 +252,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 4.0.9, < 4.1.0)
   aruba
   cucumber-rails
   factory_girl (>= 4.1.0)
@@ -255,14 +260,12 @@ DEPENDENCIES
   metasploit-concern!
   metasploit-credential!
   metasploit-framework!
+  metasploit-framework-db!
+  metasploit-framework-pcap!
   metasploit-model!
   metasploit_data_models!
-  network_interface (~> 0.0.1)
-  pcaprub
-  pg (>= 0.11)
   pry
   rake (>= 10.0.0)
-  rb-readline
   redcarpet
   rspec (>= 2.12, < 3.0.0)
   rspec-rails (>= 2.12, < 3.0.0)
diff --git a/metasploit-framework-db.gemspec b/metasploit-framework-db.gemspec
index 5de682f048..bdf3fe5f0e 100644
--- a/metasploit-framework-db.gemspec
+++ b/metasploit-framework-db.gemspec
@@ -26,14 +26,13 @@ Gem::Specification.new do |spec|
   # no files, just dependencies
   spec.files         = []
 
-  # The Metasploit ecosystem is not ready for Rails 4 as it uses features of Rails 3.X that are removed in Rails 4.
-  rails_version_constraint = '< 4.0.0'
+  rails_version_constraint = ['>= 4.0.9', '< 4.1.0']
 
   spec.add_runtime_dependency 'activerecord', rails_version_constraint
   # Metasploit::Credential database models
-  spec.add_runtime_dependency 'metasploit-credential', :github => 'rapid7/metasploit-credential', :branch => 'staging/rails-4.0'
+  #spec.add_runtime_dependency 'metasploit-credential'
   # Database models shared between framework and Pro.
-  spec.add_runtime_dependency 'metasploit_data_models', :github => 'rapid7/metasploit-credential', :branch => 'staging/rails-4.0'
+  #spec.add_runtime_dependency 'metasploit_data_models'
   # depend on metasploit-framewrok as the optional gems are useless with the actual code
   spec.add_runtime_dependency 'metasploit-framework', "= #{spec.version}"
   # Needed for module caching in Mdm::ModuleDetails
diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
index 405420ecc6..5499c212c1 100644
--- a/metasploit-framework.gemspec
+++ b/metasploit-framework.gemspec
@@ -59,10 +59,10 @@ Gem::Specification.new do |spec|
   # Needed for some admin modules (scrutinizer_add_user.rb)
   spec.add_runtime_dependency 'json'
   # Metasploit::Concern hooks
-  spec.add_runtime_dependency 'metasploit-concern', :github => 'rapid7/metasploit-credential', :branch => 'staging/rails-4.0'
+  #spec.add_runtime_dependency 'metasploit-concern'
   # Things that would normally be part of the database model, but which
   # are needed when there's no database
-  spec.add_runtime_dependency 'metasploit-model', :github => 'rapid7/metasploit-credential', :branch => 'staging/rails-4.0'
+  #spec.add_runtime_dependency 'metasploit-model'
   # Needed for Meterpreter on Windows, soon others.
   spec.add_runtime_dependency 'meterpreter_bins', '0.0.10'
   # Needed by msfgui and other rpc components