diff --git a/.gitignore b/.gitignore
index 53aef3ab..e41246b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,3 @@
 /build
 *~
 *.pyc
-po/*.mo
-po/*.gmo
diff --git a/gui/main.c b/gui/main.c
index f2afba12..46b45712 100644
--- a/gui/main.c
+++ b/gui/main.c
@@ -44,7 +44,7 @@
 #include "../daemon/conf.h"
 #include "toolbar.h"
 
-#define GETTEXT_PACKAGE "gladish"
+#define GETTEXT_PACKAGE "ladish"
 
 #define ENABLE_NLS 1
 
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 00000000..d78a19a8
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,2 @@
+# Set of available languages.
+ru fr
diff --git a/wscript b/wscript
index 708d8471..f73170b0 100644
--- a/wscript
+++ b/wscript
@@ -90,6 +90,7 @@ def configure(conf):
     conf.load('compiler_cxx')
     conf.load('boost')
     conf.load('python')
+    conf.load('intltool')
     if parallel_debug:
         conf.load('parallel_debug')
 
@@ -590,16 +591,7 @@ def build(bld):
             else:
                 pprint('CYAN', "doxygen documentation already built.")
 
-    # Translations
-    # TODO: Rewrite using waf functionality
-    po_list = os.listdir('./po')
-    if po_list.__len__() > 0:
-      for po_list_item in po_list:
-        item = po_list_item.rsplit('.', 1)
-        if item[1] == "po":
-          pprint('CYAN', "Preparing translation '"+item[0]+"'")
-          os.system("msgfmt ./po/"+po_list_item+" -o ./po/"+item[0]+".mo")
-          bld.install_as(('${LOCALE_DIR}/'+item[0]+'/LC_MESSAGES/gladish.mo'), ('./po/'+item[0]+".mo"))
+    bld(features='intltool_po', appname=APPNAME, podir='po', install_path="${LOCALE_DIR}")
 
 def get_tags_dirs():
     source_root = os.path.dirname(Utils.g_module.root_path)