diff --git a/Makefile b/Makefile
index faa5e4d5c..324414ab1 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ dist:
 	rm -rf gajim-$(VERSION)
 	mkdir gajim-$(VERSION)
 	cp -r data src po gajim-$(VERSION)/
-	cp AUTHORS gajim.1 gajim-remote.1 gajim.desktop.in COPYING Makefile Changelog README launch.sh gajim-$(VERSION)
+	cp AUTHORS gajim.1 gajim-remote.1 gajim.desktop.in COPYING THANKS Makefile Changelog README launch.sh gajim-$(VERSION)
 	mkdir gajim-$(VERSION)/scripts
 	for s in $(SCRIPTS) ; do \
 		cp $$s gajim-$(VERSION)/scripts/; \
@@ -89,6 +89,7 @@ install:
 		cp "./po/$$f" "$(DESTDIR)$(PREFIX)/share/locale/$$DST/"; \
 	done
 	cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/";
+	cp THANKS "$(DESTDIR)$(PREFIX)/share/gajim/";
 	mkdir -p "$(DESTDIR)$(PREFIX)/share/pixmaps";
 	cp data/pixmaps/gajim.png "$(DESTDIR)$(PREFIX)/share/pixmaps/";
 	cp data/pixmaps/gajim_about.png "$(DESTDIR)$(PREFIX)/share/pixmaps/";
diff --git a/THANKS b/THANKS
new file mode 100644
index 000000000..4247154da
--- /dev/null
+++ b/THANKS
@@ -0,0 +1,33 @@
+Alexander Futász
+Alexey Nezhdanov
+Alfredo Junix
+Andrew Sayman
+Christian Bjälevik
+Christoph Neuroth
+Denis Craven
+Dennis Craven
+Fabian Neumann
+Fabian Neumann
+Filippos Papadopoulos
+Francisco Alburquerque Parra (Membris Khan)
+Frederic Lory
+Fridtjof Bussefor
+Guillaume Morin
+Gustavo J. A. M. Carneiro
+Juraj Michalek
+Luis Peralta
+Michele Campeotto
+Mike Albon
+Norman Rasmussen
+Peter Saint-Andre
+Petr Menšík
+Sergey Kuleshov
+Stavros Giannouris
+Stian B. Barmen
+Thomas Klein-Hitpaß
+Urtzi Alfaro
+Witold Kieraś
+Yakov Bezrukov
+Yavor Doganov
+
+Last but not least, we thank all the package maintainers
diff --git a/src/dialogs.py b/src/dialogs.py
index 140326632..c29fe2764 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -443,12 +443,16 @@ class AboutDialog:
 		dlg.set_website('http://www.gajim.org')
 
 		authors = [
+			'Current Developers:',
 			'Yann Le Boulanger <asterix@lagaule.org>',
 			'Nikos Kouremenos <kourem@gmail.com>',
 			'Dimitur Kirov <dkirov@gmail.com>',
 			'Travis Shirk <travis@pobox.com>',
-			'Gajim patchers'
+			'',
+			'Read AUTHORS file for full list including past developers',
+			'Read THANKS file for contributors',
 		]
+		#FIXME: make See authors setence and Current devs sentence translatable
 		
 		dlg.set_authors(authors)
 		
@@ -456,7 +460,7 @@ class AboutDialog:
 			dlg.props.wrap_license = True
 
 		pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.join(
-			gajim.DATA_DIR, 'pixmaps/gajim_about.png'))			
+			gajim.DATA_DIR, 'pixmaps', 'gajim_about.png'))			
 
 		dlg.set_logo(pixbuf)
 		#here you write your name in the form Name FamilyName <someone@somewhere>