diff --git a/autogen.sh b/autogen.sh
index 47b9ed2fd..e9a3bb919 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,7 +14,7 @@
   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 \
+  && ls -1 data/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\nsrc/ipython_view.py" > po/POTFILES.skip  || exit 1
diff --git a/configure.ac b/configure.ac
index 11f6c2771..3dae7a65b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,7 @@ AC_CONFIG_FILES([
 	data/activities/Makefile
 	icons/Makefile
 	data/gajim.desktop.in
+	data/gajim-remote.desktop.in
 	data/defs.py
 	src/Makefile
 	scripts/gajim
diff --git a/data/Makefile.am b/data/Makefile.am
index 81c1c2967..1fc350aa2 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 
+desktop_in_files = 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 
+CLEANFILES = gajim.desktop gajim-remote.desktop
 
 MAINTAINERCLEANFILES = Makefile.in