--- Rakefile.old	2013-08-20 01:00:05.000000000 +0200
+++ Rakefile	2013-10-21 19:42:06.800019343 +0200
@@ -1,5 +1,6 @@
 require 'rake'
-require 'rake/gempackagetask'
+require 'rubygems'
+require 'rubygems/package_task'
 
 task :default => [:buildext]
 
@@ -15,7 +16,7 @@
 # we must (and can) skip defining the gem packaging tasks.
 if File.exist? SPECFILE
   spec = eval(File.read(SPECFILE), nil, SPECFILE)
-  Rake::GemPackageTask.new(spec) do |pkg|
+  Gem::PackageTask.new(spec) do |pkg|
     pkg.need_zip = true
     pkg.need_tar = true
   end
@@ -125,8 +126,8 @@
 }) do |t|
   po_file, mo_file = t.source, t.name
   puts "#{po_file} => #{mo_file}"
-  require 'gettext/utils'
-  GetText.rmsgfmt po_file, mo_file
+  require 'gettext/tools'
+  GetText::Tools::MsgFmt.run po_file, mo_file
 end
 
 task :check_po_tools do