diff --git a/MANIFEST.in b/MANIFEST.in
index 50401c68..4f6c1a04 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,3 +7,4 @@ include NEWS
 include screenshot.png
 recursive-include doc *.png
 recursive-include man *.1
+recursive-include i18n *.mo
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..3de27b5d
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,10 @@
+MSGFMT = msgfmt -v
+
+.SUFFIXES: .po .mo
+
+MSGOBJ := $(patsubst %.po,%.mo,$(wildcard i18n/*/LC_MESSAGES/*.po))
+
+.po.mo:
+	$(MSGFMT) -o $@ $<
+
+all: $(MSGOBJ)
diff --git a/i18n_espanol_generate.sh b/i18n_espanol_generate.sh
deleted file mode 100755
index 2d924b38..00000000
--- a/i18n_espanol_generate.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-### Generating Spanish Locale
-
-echo "Para instalar correctamente la traducción española,\n"
-echo "debe ejecutar este script como root o con sudo.\n"
-echo "\n\n"
-
-echo "Traducción de JeanBoB <jeanbob@jeanbob.eu>\n\n"
-
-
-echo "Generación del idioma española...\n"
-msgfmt i18n/es/LC_MESSAGES/glances.po -o i18n/es/LC_MESSAGES/glances.mo
-echo "Instalación en el siguiente directorio: /usr/share/locale/es/LC_MESSAGES/\n"
-cp i18n/es/LC_MESSAGES/glances.mo /usr/share/locale/es/LC_MESSAGES/glances.mo
-echo "¡Instalación terminado!\n\n"
\ No newline at end of file
diff --git a/i18n_francais_generate.sh b/i18n_francais_generate.sh
deleted file mode 100755
index a201f936..00000000
--- a/i18n_francais_generate.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-### Generating French Locale
-
-echo "Pour réussir l'installation de la localisation française,\n"
-echo "vous devez executer ce script sous l'utilisateur root ou avec sudo.\n"
-echo "\n\n"
-
-echo "Traduction par JeanBoB <jeanbob@jeanbob.eu>\n\n"
-
-
-echo "Genération de la langue française...\n"
-msgfmt i18n/fr/LC_MESSAGES/glances.po -o i18n/fr/LC_MESSAGES/glances.mo
-echo "Installation dans le répertoire /usr/share/locale/fr/LC_MESSAGES/\n"
-cp i18n/fr/LC_MESSAGES/glances.mo /usr/share/locale/fr/LC_MESSAGES/glances.mo
-echo "Installation terminée\n\n"
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 813b5521..2a875b23 100755
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,24 @@
 #!/usr/bin/env python
 
 from glob import glob
+from os.path import dirname
 
 from setuptools import setup
 
+data_files = [
+    ('share/man/man1', ['man/glances.1']),
+    ('share/doc/glances', ['README',
+        'README-fr',
+        'COPYING',
+        'AUTHORS',
+        'ChangeLog',
+        'NEWS',
+        'screenshot.png']),
+    ('share/doc/glances/doc', glob('doc/*.png')),
+]
+for mo in glob('i18n/*/LC_MESSAGES/*.mo'):
+    data_files.append((dirname(mo).replace('i18n/', 'share/locale/'), [mo]))
+
 setup(name='Glances',
     version='1.4b',
     download_url='https://github.com/downloads/nicolargo/glances/glances-1.4b.tar.gz',
@@ -17,16 +32,6 @@ setup(name='Glances',
     install_requires=['psutil>=0.4.1'],
     packages=['glances'],
     include_package_data=True,
-    data_files=[
-        ('share/man/man1', ['man/glances.1']),
-        ('share/doc/glances', ['README',
-            'README-fr',
-            'COPYING',
-            'AUTHORS',
-            'ChangeLog',
-            'NEWS',
-            'screenshot.png']),
-        ('share/doc/glances/doc', glob('doc/*.png')),
-    ],
+    data_files=data_files,
     entry_points={"console_scripts": ["glances = glances.glances:main"]},
 )