diff --git a/.gitignore b/.gitignore
index 517450d..96f60c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /i18n-0.4.2.gem
 /i18n-0.5.0.gem
 /i18n-0.6.0.gem
+/i18n-0.6.1.gem
diff --git a/rubygem-i18n.spec b/rubygem-i18n.spec
index 55b0539..4a163ea 100644
--- a/rubygem-i18n.spec
+++ b/rubygem-i18n.spec
@@ -2,7 +2,7 @@
 
 Summary: New wave Internationalization support for Ruby
 Name: rubygem-%{gem_name}
-Version: 0.6.0
+Version: 0.6.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT and (GPLv2 or Ruby)
@@ -35,7 +35,9 @@ Documentation for %{name}
 %prep
 %setup -q -c -T
 mkdir -p .%{gem_dir}
-gem install --local --install-dir .%{gem_dir} \
+# Avoid some encoding complaints.
+# https://github.com/svenfuchs/i18n/issues/176
+LANG=en_US.utf8 gem install --local --install-dir .%{gem_dir} \
             --force --rdoc %{SOURCE0}
 
 %build
@@ -52,10 +54,6 @@ pushd .%{gem_instdir}
 
 # Bundler just complicates everything in our case, remove it.
 sed -i -e "s|require 'bundler/setup'||" test/test_helper.rb
-# workaround for failing test - but I consider it to be a bug,
-# upstream fix doesn't work
-# see https://github.com/svenfuchs/i18n/issues/114#issuecomment-7065131
-echo ' ' > test/test_data/locales/invalid/empty.yml
 # Tests are failing without LANG environment is set.
 # https://github.com/svenfuchs/i18n/issues/115
 LANG=en_US.utf8 testrb -Ilib test/all.rb
@@ -77,6 +75,9 @@ popd
 
 
 %changelog
+* Fri Oct 26 2012 Vít Ondruch <vondruch@redhat.com> - 0.6.1-1
+- Update to I18n 0.6.1.
+
 * Wed Jul 18 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 0.6.0-1
 - Update to I18n 0.6.0.
 - Removed unneeded %%defattr usage.
diff --git a/sources b/sources
index 05f2ee6..27a069e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb94282dab8aadb7de15db134f8133ff  i18n-0.6.0.gem
+65d1e00b3fea80b4062952a0553372e5  i18n-0.6.1.gem