---
 Rakefile |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- a/Rakefile
+++ b/Rakefile
@@ -40,7 +40,7 @@ NON_PLUGIN_FILES = FileList["{lib,bin,da
 task :define_po_rules do
   # generate pot file from rb files
   rgettext_proc = proc do |t|
-    require 'gettext/utils'
+    require 'gettext/tools'
     source_files, pot_file = t.prerequisites, t.name
     new_pot_file = "#{pot_file}.new"
     puts "#{source_files.join(', ')} => #{pot_file}"
@@ -72,7 +72,7 @@ task :define_po_rules do
 
   # update po file from pot file
   msgmerge_proc = proc do |t|
-    require 'gettext/utils'
+    require 'gettext/tools'
     po_file, pot_file = t.name, t.source
     puts "#{pot_file} => #{po_file}"
     if File.exist? po_file
@@ -112,8 +112,8 @@ rule(%r'^data/locale/.+/LC_MESSAGES/.+\.
 }) 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, "-o", mo_file)
 end
 
 task :check_po_tools do
@@ -171,7 +171,7 @@ end
 # to make installation not fail because of lack of ruby-gettext
 task :buildext do
   begin
-    require 'gettext/utils'
+    require 'gettext/tools'
     Rake::Task[:makemo].invoke
   rescue LoadError
     warn 'Ruby-gettext cannot be located, so mo files cannot be built and installed' 
