diff --git a/Makefile b/Makefile
index 55a9e55..55a282a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-EXTRACTFILES=utilities/locales_files.txt
+EXTRACTDIR=-D lib -D themes/default/templates
 EN=themes/default/lib/Lufi/I18N/en.po
 FR=themes/default/lib/Lufi/I18N/fr.po
 IT=themes/default/lib/Lufi/I18N/it.po
@@ -11,12 +11,12 @@ REAL_LUFI=script/application
 LUFI=script/lufi
 
 locales:
-	$(XGETTEXT) -f $(EXTRACTFILES) -o $(EN) 2>/dev/null
-	$(XGETTEXT) -f $(EXTRACTFILES) -o $(FR) 2>/dev/null
-	$(XGETTEXT) -f $(EXTRACTFILES) -o $(IT) 2>/dev/null
-	$(XGETTEXT) -f $(EXTRACTFILES) -o $(OC) 2>/dev/null
-	$(XGETTEXT) -f $(EXTRACTFILES) -o $(CA) 2>/dev/null
-	$(XGETTEXT) -f $(EXTRACTFILES) -o $(PT) 2>/dev/null
+	$(XGETTEXT) $(EXTRACTDIR) -o $(EN) 2>/dev/null
+	$(XGETTEXT) $(EXTRACTDIR) -o $(FR) 2>/dev/null
+	$(XGETTEXT) $(EXTRACTDIR) -o $(IT) 2>/dev/null
+	$(XGETTEXT) $(EXTRACTDIR) -o $(OC) 2>/dev/null
+	$(XGETTEXT) $(EXTRACTDIR) -o $(CA) 2>/dev/null
+	$(XGETTEXT) $(EXTRACTDIR) -o $(PT) 2>/dev/null
 
 test:
 	$(CARTON) $(REAL_LUFI) test
diff --git a/utilities/locales_files.txt b/utilities/locales_files.txt
deleted file mode 100644
index 4627896..0000000
--- a/utilities/locales_files.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-themes/default/templates/layouts/default.html.ep
-themes/default/templates/index.html.ep
-themes/default/templates/delays.html.ep
-themes/default/templates/files.html.ep
-themes/default/templates/mail.html.ep
-themes/default/templates/msg.html.ep
-themes/default/templates/render.html.ep
-themes/default/templates/about.html.ep
-themes/default/templates/login.html.ep
-themes/default/templates/logout.html.ep
-lib/Lufi/Controller/Files.pm
-lib/Lufi/Controller/Mail.pm
-lib/Lufi.pm