diff --git a/src/configure.in b/src/configure.in
deleted file mode 100644
index 98eb6206d..000000000
--- a/src/configure.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# fake file, so that intltools work
-# $Id$
-
-AM_INIT_AUTOMAKE(tuxpaint, 0.9.14)
-AM_PROG_XML_I18N_TOOLS
-
diff --git a/src/po/LINGUAS b/src/po/LINGUAS
new file mode 100644
index 000000000..6a01e3aee
--- /dev/null
+++ b/src/po/LINGUAS
@@ -0,0 +1,129 @@
+ach
+af
+ak
+am
+an
+ar
+as
+ast
+az
+be
+bg
+bm
+bn
+bo
+br
+brx
+bs
+ca
+ca@valencia
+cgg
+cs
+cy
+da
+de
+doi
+el
+en_AU
+en_CA
+en_GB
+en_ZA
+eo
+es_MX
+es
+et
+eu
+fa
+ff
+fi
+fo
+fr
+ga
+gd
+gl
+gos
+gu
+he
+hi
+hr
+hu
+hy
+id
+is
+it
+iu
+ja
+kab
+ka
+km
+kn
+kok
+kok@roman
+ko
+ks@devanagari
+ks
+ku
+lb
+lg
+lt
+lv
+mai
+mk
+ml
+mni@meiteimayek
+mni
+mn
+mr
+ms
+nb
+ne
+nl
+nn
+nr
+nso
+oc
+oj
+or
+pa
+pl
+pt_BR
+pt
+ro
+ru
+rw
+sa
+sat@olchiki
+sat
+sc
+sd@devanagari
+sd
+shs
+si
+sk
+sl
+son
+sq
+sr@latin
+sr
+su
+sv
+sw
+ta
+te
+th
+tlh
+tl
+tr
+tw
+uk
+ur
+vec
+ve
+vi
+wa
+wo
+xh
+zam
+zh_CN
+zh_TW
+zu
diff --git a/src/po/POTFILES.in.in b/src/po/POTFILES.in.in
index 7b20a2945..ace0b33cc 100644
--- a/src/po/POTFILES.in.in
+++ b/src/po/POTFILES.in.in
@@ -1,4 +1,3 @@
-[encoding: UTF-8]
 colors.h
 dirwalk.c
 fill_tools.h
diff --git a/src/po/update-po.sh b/src/po/update-po.sh
index 15a70aba9..4d2e04a2b 100755
--- a/src/po/update-po.sh
+++ b/src/po/update-po.sh
@@ -1,14 +1,23 @@
 #!/bin/sh
+cd $(dirname "$0")
 
-cp POTFILES.in.in POTFILES.in
-ls ../../magic/src/*.c | cut -b 4- >> POTFILES.in
+sed -e 's/^/..\//' POTFILES.in.in > POTFILES.in
+ls ../../magic/src/*.c >> POTFILES.in
+
+xgettext \
+  --package-name=tuxpaint \
+  --files-from=POTFILES.in \
+  --from-code=UTF-8 \
+  --keyword=gettext_noop \
+  --add-comments \
+  --output=tuxpaint.pot
 
-intltool-update --pot
-msguniq tuxpaint.pot > temp.tmp && mv -f temp.tmp tuxpaint.pot
 for i in *.po ; do
   echo $i
   msgmerge --update --previous --backup=none $i tuxpaint.pot
 done
-cd ..
-intltool-merge -d -u po tuxpaint.desktop.in tuxpaint.desktop
-cd po
+
+msgfmt --desktop \
+  -d . \
+  --template ../tuxpaint.desktop.in \
+  --output-file ../tuxpaint.desktop
diff --git a/src/tuxpaint.desktop.in b/src/tuxpaint.desktop.in
index ad5ffd87a..12b1d1392 100644
--- a/src/tuxpaint.desktop.in
+++ b/src/tuxpaint.desktop.in
@@ -1,9 +1,9 @@
 [Desktop Entry]
-_Name=Tux Paint
+Name=Tux Paint
 Type=Application
 Exec=tuxpaint
 Icon=tuxpaint
 Terminal=false
 Categories=Education;Art;
-_GenericName=Drawing program
-_Comment=A drawing program for children.
+GenericName=Drawing program
+Comment=A drawing program for children.