diff --git a/.gitignore b/.gitignore
index d9f09f1a8..5a858c8a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ syntax: glob
 *~
 autom4te.cache
 data/defs.py
-data/gajim.desktop
+data/org.gajim.Gajim.desktop
 libtool
 po/.intltool-merge-cache
 po/POTFILES
diff --git a/autogen.sh b/autogen.sh
index 090b63e2d..7f7362b35 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,10 +5,10 @@
   echo "[encoding: UTF-8]" > po/POTFILES.in \
   && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
   po/POTFILES.in; done \
-  && ls -1 data/gajim.desktop.in.in data/gajim-remote.desktop.in.in \
+  && ls -1 data/org.gajim.Gajim.desktop.in.in data/gajim-remote.desktop.in.in \
   src/*.py src/common/*.py src/command_system/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \
   po/POTFILES.in \
-  && echo -e "data/gajim.desktop.in\ndata/gajim-remote.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip  || exit 1
+  && echo -e "data/org.gajim.Gajim.desktop.in\ndata/gajim-remote.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip  || exit 1
   if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then
     ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip
   fi
diff --git a/configure.ac b/configure.ac
index fdaaabd6c..2ba30d498 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,7 @@ AC_CONFIG_FILES([
 	data/moods/Makefile
 	data/activities/Makefile
 	icons/Makefile
-	data/gajim.desktop.in
+	data/org.gajim.Gajim.desktop.in
 	data/gajim-remote.desktop.in
 	data/defs.py
 	src/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 1fc350aa2..c2d6b1384 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = gui emoticons pixmaps iconsets moods activities
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
-desktop_in_files = gajim.desktop.in.in gajim-remote.desktop.in.in
+desktop_in_files = org.gajim.Gajim.desktop.in.in gajim-remote.desktop.in.in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
 installdefsdir = $(gajim_srcdir)/common
@@ -29,6 +29,6 @@ EXTRA_DIST = $(desktop_in_files) \
 DISTCLEANFILES = $(desktop_DATA) \
 				 $(installdefs_DATA)
 
-CLEANFILES = gajim.desktop gajim-remote.desktop
+CLEANFILES = org.gajim.Gajim.desktop gajim-remote.desktop
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/gajim.desktop.in.in b/data/org.gajim.Gajim.desktop.in.in
similarity index 92%
rename from data/gajim.desktop.in.in
rename to data/org.gajim.Gajim.desktop.in.in
index dcd235c57..b8a5c0e08 100644
--- a/data/gajim.desktop.in.in
+++ b/data/org.gajim.Gajim.desktop.in.in
@@ -6,7 +6,7 @@ _Comment=A GTK+ Jabber client
 _Keywords=chat;messaging;im;xmpp;bonjour;voip;
 Version=1.0
 Exec=gajim
-Icon=gajim
+Icon=org.gajim.Gajim
 StartupNotify=true
 StartupWMClass=Gajim
 Terminal=false
diff --git a/icons/Makefile.am b/icons/Makefile.am
index e61275c37..2c6fcec2e 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -2,6 +2,6 @@ iconsdir = $(pkgdatadir)/icons
 nobase_dist_icons_DATA = $(srcdir)/*/*/*/*
 
 systemiconsdir = $(datadir)/icons
-nobase_dist_systemicons_DATA = $(srcdir)/*/*/*/gajim.*
+nobase_dist_systemicons_DATA = $(srcdir)/*/*/*/org.gajim.Gajim.*
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/icons/hicolor/128x128/apps/gajim.png b/icons/hicolor/128x128/apps/org.gajim.Gajim.png
similarity index 100%
rename from icons/hicolor/128x128/apps/gajim.png
rename to icons/hicolor/128x128/apps/org.gajim.Gajim.png
diff --git a/icons/hicolor/64x64/apps/gajim.png b/icons/hicolor/64x64/apps/org.gajim.Gajim.png
similarity index 100%
rename from icons/hicolor/64x64/apps/gajim.png
rename to icons/hicolor/64x64/apps/org.gajim.Gajim.png
diff --git a/icons/hicolor/scalable/apps/gajim.svg b/icons/hicolor/scalable/apps/org.gajim.Gajim.svg
similarity index 100%
rename from icons/hicolor/scalable/apps/gajim.svg
rename to icons/hicolor/scalable/apps/org.gajim.Gajim.svg