diff --git a/Gemfile b/Gemfile
index 2526802ee0..f855eb9297 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,6 +21,7 @@ gem 'newrelic_rpm'
 gem 'spree_heroku', :git => 'git://github.com/eaterprises/spree-heroku.git'
 gem 'haml'
 gem 'aws-sdk'
+gem 'db2fog'
 gem 'andand'
 gem 'truncate_html'
 gem 'representative_view'
diff --git a/Gemfile.lock b/Gemfile.lock
index aee3428b19..055e5e8ebb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -173,6 +173,10 @@ GEM
       paperclip (>= 2.3.0)
       rails (>= 3.0.0)
     database_cleaner (0.7.1)
+    db2fog (0.7.0)
+      activerecord (~> 3.0)
+      fog (~> 1.0)
+      rails (~> 3.0)
     debugger (1.1.4)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
@@ -190,6 +194,7 @@ GEM
       warden (~> 1.1.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    excon (0.16.2)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (3.3.0)
@@ -200,7 +205,18 @@ GEM
     faker (1.0.1)
       i18n (~> 0.4)
     ffaker (1.12.1)
-    ffi (1.3.1)
+    ffi (1.7.0)
+    fog (1.5.0)
+      builder
+      excon (~> 0.14)
+      formatador (~> 0.2.0)
+      mime-types
+      multi_json (~> 1.0)
+      net-scp (~> 1.0.4)
+      net-ssh (>= 2.1.3)
+      nokogiri (~> 1.5.0)
+      ruby-hmac
+    formatador (0.2.3)
     haml (3.1.6)
     highline (1.6.11)
     hike (1.2.1)
@@ -240,6 +256,9 @@ GEM
     nested_set (1.7.0)
       activerecord (>= 3.0.0)
       railties (>= 3.0.0)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.5.2)
     newrelic_rpm (3.6.0.83)
     nokogiri (1.5.6)
     orm_adapter (0.0.7)
@@ -313,6 +332,7 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.10.0)
+    ruby-hmac (0.4.0)
     rubyzip (0.9.9)
     sass (3.1.19)
     sass-rails (3.2.5)
@@ -372,6 +392,7 @@ DEPENDENCIES
   coffee-rails (~> 3.2.1)
   comfortable_mexican_sofa
   database_cleaner (= 0.7.1)
+  db2fog
   factory_girl_rails
   faker
   haml
diff --git a/config/initializers/db2fog.rb b/config/initializers/db2fog.rb
new file mode 100644
index 0000000000..84579d4d42
--- /dev/null
+++ b/config/initializers/db2fog.rb
@@ -0,0 +1,6 @@
+DB2Fog.config = {
+  :aws_access_key_id     => Spree::Config[:s3_access_key],
+  :aws_secret_access_key => Spree::Config[:s3_secret],
+  :directory             => Spree::Config[:s3_bucket],
+  :provider              => 'AWS'
+}