diff --git a/Gemfile b/Gemfile
index 863c6cd8..dbcf09f2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,6 @@ platforms :rbx do
   gem 'rubinius-developer_tools'
 end
 
-gem 'country_select', '~> 1.1.1'
+gem 'country_select', '~> 2.1.0'
 gem 'railties'
 gem 'rake'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0d872f73..713f0115 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,7 +31,11 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     builder (3.2.2)
-    country_select (1.1.3)
+    countries (0.9.3)
+      currencies (~> 0.4.2)
+    country_select (2.1.0)
+      countries (~> 0.9, >= 0.9.3)
+    currencies (0.4.2)
     erubis (2.7.0)
     ffi2-generators (0.1.1)
     i18n (0.7.0)
@@ -276,7 +280,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  country_select (~> 1.1.1)
+  country_select (~> 2.1.0)
   railties
   rake
   rubinius-developer_tools
diff --git a/gemfiles/Gemfile.rails-4-0-stable b/gemfiles/Gemfile.rails-4-0-stable
index c3141668..36494274 100644
--- a/gemfiles/Gemfile.rails-4-0-stable
+++ b/gemfiles/Gemfile.rails-4-0-stable
@@ -7,7 +7,7 @@ platforms :rbx do
   gem 'rubinius-developer_tools'
 end
 
-gem 'country_select', '~> 1.1.1'
+gem 'country_select', '~> 2.1.0'
 gem 'railties', github: 'rails/rails', branch: '4-0-stable'
 gem 'activemodel', github: 'rails/rails', branch: '4-0-stable'
 gem 'actionpack', github: 'rails/rails', branch: '4-0-stable'
diff --git a/gemfiles/Gemfile.rails-4-1-stable b/gemfiles/Gemfile.rails-4-1-stable
index 06302097..092773f9 100644
--- a/gemfiles/Gemfile.rails-4-1-stable
+++ b/gemfiles/Gemfile.rails-4-1-stable
@@ -7,7 +7,7 @@ platforms :rbx do
   gem 'rubinius-developer_tools'
 end
 
-gem 'country_select', '~> 1.1.1'
+gem 'country_select', '~> 2.1.0'
 gem 'railties', github: 'rails/rails', branch: '4-1-stable'
 gem 'activemodel', github: 'rails/rails', branch: '4-1-stable'
 gem 'actionpack', github: 'rails/rails', branch: '4-1-stable'
diff --git a/gemfiles/Gemfile.rails-4-2-stable b/gemfiles/Gemfile.rails-4-2-stable
index 717ec993..7a95c9a2 100644
--- a/gemfiles/Gemfile.rails-4-2-stable
+++ b/gemfiles/Gemfile.rails-4-2-stable
@@ -7,7 +7,7 @@ platforms :rbx do
   gem 'rubinius-developer_tools'
 end
 
-gem 'country_select', '~> 1.1.1'
+gem 'country_select', '~> 2.1.0'
 gem 'railties', github: 'rails/rails', branch: '4-2-stable'
 gem 'activemodel', github: 'rails/rails', branch: '4-2-stable'
 gem 'actionpack', github: 'rails/rails', branch: '4-2-stable'
diff --git a/test/inputs/priority_input_test.rb b/test/inputs/priority_input_test.rb
index 3b8bbeb1..8c4b50fa 100644
--- a/test/inputs/priority_input_test.rb
+++ b/test/inputs/priority_input_test.rb
@@ -5,14 +5,14 @@ class PriorityInputTest < ActionView::TestCase
   test 'input generates a country select field' do
     with_input_for @user, :country, :country
     assert_select 'select#user_country'
-    assert_select 'select option[value=Brazil]', 'Brazil'
-    assert_no_select 'select option[value=""][disabled=disabled]'
+    assert_select 'select option[value=BR]', 'Brazil'
+    assert_no_select 'select option[value="---------------"][disabled=disabled]', '---------------'
   end
 
   test 'input generates a country select with SimpleForm default' do
     swap SimpleForm, country_priority: [ 'Brazil' ] do
       with_input_for @user, :country, :country
-      assert_select 'select option[value=""][disabled=disabled]'
+      assert_select 'select option[value="---------------"][disabled=disabled]', '---------------'
     end
   end