diff --git a/.gitignore b/.gitignore
index 1a0a64b5c..5fb4cfad9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,5 +21,6 @@ tmtags
 coverage
 rdoc
 pkg
+/.bundle
 
 ## PROJECT::SPECIFIC
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000000000..456db6d84
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,16 @@
+source "http://rubygems.org"
+
+gem 'solr-ruby', '>= 0.0.6'
+gem 'xml-simple', '>= 1.0.12'
+gem 'mime-types', '>= 1.16'
+gem 'multipart-post'
+gem 'nokogiri'
+gem 'om', '>= 1.0'
+gem 'solrizer', '>=0.3.0'
+# gem 'yaml'
+
+group :development, :test do
+  gem "rspec", ">= 1.2.9"
+  gem "mocha", ">= 0.9.8"
+  gem "ruby-debug"
+end
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000000000..a68010a70
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,58 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    active-fedora (1.2.4)
+      mime-types (>= 1.16)
+      multipart-post
+      nokogiri
+      om (>= 1.0)
+      solr-ruby (>= 0.0.6)
+      xml-simple (>= 1.0.12)
+    columnize (0.3.1)
+    diff-lcs (1.1.2)
+    facets (2.9.0)
+    linecache (0.43)
+    mime-types (1.16)
+    mocha (0.9.9)
+      rake
+    multipart-post (1.0.1)
+    nokogiri (1.4.3.1)
+    om (1.0.0)
+      facets
+      nokogiri (>= 1.4.2)
+    rake (0.8.7)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+    solr-ruby (0.0.8)
+    solrizer (0.3.0)
+      active-fedora (>= 1.1.5)
+      om (>= 1.0.0)
+    xml-simple (1.0.12)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mime-types (>= 1.16)
+  mocha (>= 0.9.8)
+  multipart-post
+  nokogiri
+  om (>= 1.0)
+  rspec (>= 1.2.9)
+  ruby-debug
+  solr-ruby (>= 0.0.6)
+  solrizer (>= 0.3.0)
+  xml-simple (>= 1.0.12)
diff --git a/Rakefile b/Rakefile
index af89adbbd..61a9b679e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -14,21 +14,6 @@ begin
     gem.homepage = "http://yourmediashelf.com/activefedora"
     gem.authors = ["Matt Zumwalt", "McClain Looney"]
     gem.rubyforge_project = 'rubyfedora'
-    
-    gem.add_dependency('solr-ruby', '>= 0.0.6')
-    gem.add_dependency('xml-simple', '>= 1.0.12')
-    gem.add_dependency('mime-types', '>= 1.16')
-    gem.add_dependency('multipart-post')
-    gem.add_dependency('nokogiri')
-    # gem.add_dependency('om', '>= 0.1.9')
-    gem.add_dependency('om', '>= 1.0')
-    # gem.add_dependency('solrizer', '>=0.1.4')
-    # gem.add_dependency('yaml')
-
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "mocha", ">= 0.9.8"
-    gem.add_development_dependency "ruby-debug"
-
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new