diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6ca246e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+Gemfile.lock
+.ruby-version
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..16ef4c1
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,6 @@
+# coding: utf-8
+source 'http://rubygems.org'
+
+gem 'fastimage'
+
+gemspec
diff --git a/Rakefile b/Rakefile
index f364879..f9b9ca8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,12 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
 require 'paperclip'
 
+import 'lib/tasks/paperclip_tasks.rake'
+
 desc 'Default: run unit tests.'
 task :default => [:clean, :test]
 
@@ -59,7 +61,7 @@ exclude_file_globs = ["test/s3.yml",
                       "test/pkg/*",
                       "test/tmp",
                       "test/tmp/*"]
-spec = Gem::Specification.new do |s| 
+spec = Gem::Specification.new do |s|
   s.name              = "paperclip"
   s.version           = Paperclip::VERSION
   s.author            = "Jon Yurek"
@@ -85,13 +87,13 @@ task :manifest => :clean do
     puts file
   end
 end
- 
+
 desc "Generate a gemspec file for GitHub"
 task :gemspec => :clean do
   File.open("#{spec.name}.gemspec", 'w') do |f|
     f.write spec.to_ruby
   end
-end 
+end
 
 desc "Build the gem into the current directory"
 task :gem => :gemspec do
diff --git a/lib/paperclip.rb b/lib/paperclip.rb
index c4877a2..5d0963c 100644
--- a/lib/paperclip.rb
+++ b/lib/paperclip.rb
@@ -27,6 +27,7 @@
 
 require 'tempfile'
 require 'fastimage'
+require 'sidekiq'
 require 'paperclip/upfile'
 require 'paperclip/iostream'
 require 'paperclip/geometry'
diff --git a/lib/paperclip/storage.rb b/lib/paperclip/storage.rb
index 2b8f5d0..2b789de 100644
--- a/lib/paperclip/storage.rb
+++ b/lib/paperclip/storage.rb
@@ -106,7 +106,7 @@ module Paperclip
 
       class UploadWorker
         include ::Sidekiq::Worker
-        sidekiq_options queue: ::IMAGE_UPLOAD_QUEUE
+        sidekiq_options queue: :paperclip
 
         def perform(class_name, name, id)
           file = class_name.constantize.find_by_id(id)
diff --git a/paperclip.gemspec b/paperclip.gemspec
index 398a5c6..25aeb12 100644
--- a/paperclip.gemspec
+++ b/paperclip.gemspec
@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{File attachments as attributes for ActiveRecord}
 
+  s.add_dependency('sidekiq', ["~> 2.0"])
+
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2