diff --git a/Gemfile b/Gemfile
index 6234e45f9..71c74de37 100644
--- a/Gemfile
+++ b/Gemfile
@@ -100,7 +100,7 @@ gem 'typhoeus'
 gem 'haml', '3.1.4'
 gem 'mobile-fu'
 gem 'sass', '3.1.11'
-gem 'will_paginate', '3.0.pre2'
+gem 'will_paginate', '3.0.2'
 gem 'client_side_validations'
 
 # web
diff --git a/Gemfile.lock b/Gemfile.lock
index 6cdb6c579..1b60f21dd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -173,7 +173,7 @@ GEM
     faraday (0.7.0)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
-      rack (< 2, >= 1.1.0)
+      rack (>= 1.1.0, < 2)
     faraday-stack (0.1.3)
       faraday (~> 0.6)
     fastercsv (1.5.4)
@@ -276,7 +276,7 @@ GEM
     nokogiri (1.5.0)
     oauth (0.4.5)
     oauth2 (0.5.0)
-      faraday (< 0.8, >= 0.6.1)
+      faraday (>= 0.6.1, < 0.8)
       multi_json (~> 1.0.0)
     oauth2-provider (0.0.19)
       activesupport (~> 3.0)
@@ -394,7 +394,7 @@ GEM
     simple_oauth (0.1.5)
     sinatra (1.2.7)
       rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
+      tilt (>= 1.2.2, < 2.0)
     sqlite3 (1.3.5)
     subexec (0.1.0)
     systemu (2.2.0)
@@ -424,7 +424,7 @@ GEM
     webmock (1.6.2)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
-    will_paginate (3.0.pre2)
+    will_paginate (3.0.2)
     xpath (0.1.4)
       nokogiri (~> 1.3)
     yajl-ruby (1.1.0)
@@ -515,5 +515,5 @@ DEPENDENCIES
   typhoeus
   vanna!
   webmock
-  will_paginate (= 3.0.pre2)
+  will_paginate (= 3.0.2)
   yard