Index: trunk/server/vino-server.desktop.in.in
===================================================================
--- trunk/server/vino-server.desktop.in.in	(revision 0)
+++ trunk/server/vino-server.desktop.in.in	(revision 0)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+_Name=Remote Desktop
+_Comment=Gnome Remote Desktop Server
+Exec=@LIBEXECDIR@/vino-server
+OnlyShowIn=GNOME;
+Terminal=false
+Type=Application
+Autostart-Condition=GNOME /desktop/gnome/remote_access/enabled
+X-GNOME-Autostart-Phase=Applications
+X-GNOME-AutoRestart=true
Index: trunk/server/Makefile.am
===================================================================
--- trunk/server/Makefile.am	(revision 890)
+++ trunk/server/Makefile.am	(working copy)
@@ -136,6 +136,15 @@
 
 @INTLTOOL_SERVER_RULE@
 
+vino-server.desktop.in: vino-server.desktop.in.in
+	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+
+desktopdir      = $(datadir)/gnome/autostart
+desktop_in_files = vino-server.desktop.in
+desktop_DATA    = $(desktop_in_files:.desktop.in=.desktop)
+
+@INTLTOOL_DESKTOP_RULE@
+
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	if test -z "$(DESTDIR)" ; then \
@@ -156,6 +165,7 @@
 	vino-marshal.list \
 	GNOME_RemoteDesktop.server.in.in \
 	GNOME_RemoteDesktop.idl \
+	vino-server.desktop.in.in \
 	$(NULL)
 
 BUILT_SOURCES = \
@@ -166,6 +176,10 @@
 	vino-marshal.h \
 	$(NULL)
 
+CLEANFILES = \
+	vino-server.desktop     \
+	vino-server.desktop.in
+
 DISTCLEANFILES = \
 	GNOME_RemoteDesktop.server.in \
 	GNOME_RemoteDesktop.server \
