diff --git a/Makefile b/Makefile
index cf05064..fce8d03 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,10 @@
 # Copyright (c) 2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Released under the terms of the GNU GPLv3 license
 
-NAME=mambatray
+PACKAGE=mambatray
+
+distdir = $(PACKAGE)-$(VERSION)
+dist_archive = $(distdir).tar.bz2
 
 include VERSION
 
@@ -62,13 +65,20 @@ install: install-dirs install-locales install-icons
 	$(INSTALL_DATA) mambatray.desktop $(DESTDIR)$(xdgautostartdir)/mambatray.desktop
 
 clean: 
+	rm -f $(pck_catalogs:.po=.mo)
+	rm -f $(dist_archive)
 
 dist: clean
+	@git clean -f
 	@git log > NEWS
-	@tar cf - -C .. $(NAME)-$(VERSION) --exclude=$(NAME)-$(VERSION).tar.bz2 | bzip2 -9 -c > $(NAME)-$(VERSION).tar.bz2
-	rm -f $(pck_catalogs:.po=.mo)
+	@mkdir /tmp/$(distdir)
+	@cp -a * /tmp/$(distdir)/
+	@rm -f $(dist_archive);\
+	tar cf - -C /tmp $(distdir) | bzip2 -9 -c > $(dist_archive)
+	@rm -rf /tmp/$(distdir)
+	@echo "file \`$(dist_archive)' created"
 
 dist-rpm: dist
 	@rpm_sourcedir=`rpm --eval=%{_sourcedir}`;\
-	mv -f $(NAME)-$(VERSION).tar.bz2 $$rpm_sourcedir;\
-	echo "File $$rpm_sourcedir/$(NAME)-$(VERSION).tar.bz2 created."
+	mv -f $(PACKAGE)-$(VERSION).tar.bz2 $$rpm_sourcedir;\
+	echo "File $$rpm_sourcedir/$(PACKAGE)-$(VERSION).tar.bz2 created."
diff --git a/mambatray.lang b/mambatray.lang
deleted file mode 100644
index 3c3d712..0000000
--- a/mambatray.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-%lang(it) /usr/share/locale/it/LC_MESSAGES/mambatray.mo
-%lang(es) /usr/share/locale/es/LC_MESSAGES/mambatray.mo