--- Makefile.in.orig	2011-07-29 16:12:19.000000000 +0200
+++ Makefile.in	2013-06-21 21:33:42.000000000 +0200
@@ -79,7 +79,7 @@
 	"$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(lxpaneldir)" \
 	"$(DESTDIR)$(lxpanel_paneldir)" "$(DESTDIR)$(openboxdir)" \
 	"$(DESTDIR)$(pcmanfmdir)" "$(DESTDIR)$(wallpapersdir)" \
-	"$(DESTDIR)$(xsessiondir)"
+	"$(DESTDIR)$(xsessiondir)" "$(DESTDIR)$(xdgdir)"
 SCRIPTS = $(bin_SCRIPTS)
 SOURCES =
 DIST_SOURCES =
@@ -92,7 +92,7 @@
 	ps-recursive uninstall-recursive
 DATA = $(defaults_DATA) $(images_DATA) $(lxpanel_DATA) \
 	$(lxpanel_panel_DATA) $(openbox_DATA) $(pcmanfm_DATA) \
-	$(wallpapers_DATA) $(xsession_DATA)
+	$(wallpapers_DATA) $(xsession_DATA) $(xdg_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -214,14 +214,17 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xsesspath = @xsesspath@
+xdgpath = @xdgpath@
 SUBDIRS = man
 bin_SCRIPTS = startlxde lxde-logout openbox-lxde
 
 # Currently these paths are hardcoded.
 xsessiondir = $(xsesspath)
 xsession_DATA = LXDE.desktop
+xdgdir = $(xdgpath)
+xdg_DATA = lxde-logout.desktop
 defaultsdir = $(sysconfdir)/xdg/lxsession/LXDE
-defaults_DATA = autostart desktop.conf
+defaults_DATA = autostart
 wallpapersdir = $(datadir)/lxde/wallpapers
 wallpapers_DATA = \
 	wallpapers/lxde_blue.jpg \
@@ -243,8 +246,7 @@
 	openbox/menu.xml
 
 pcmanfmdir = $(sysconfdir)/xdg/pcmanfm/LXDE
-pcmanfm_DATA = \
-	pcmanfm/pcmanfm.conf
+pcmanfm_DATA =
 
 EXTRA_DIST = \
 	autostart \
@@ -508,6 +510,26 @@
 	test -n "$$files" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(xsessiondir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(xsessiondir)" && rm -f $$files
+install-xdgDATA: $(xdg_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(xdgdir)" || $(MKDIR_P) "$(DESTDIR)$(xdgdir)"
+	@list='$(xdg_DATA)'; test -n "$(xdgdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xdgdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(xdgdir)" || exit $$?; \
+	done
+
+uninstall-xdgDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(xdg_DATA)'; test -n "$(xdgdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(xdgdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(xdgdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -824,7 +846,7 @@
 all-am: Makefile $(SCRIPTS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(defaultsdir)" "$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(lxpaneldir)" "$(DESTDIR)$(lxpanel_paneldir)" "$(DESTDIR)$(openboxdir)" "$(DESTDIR)$(pcmanfmdir)" "$(DESTDIR)$(wallpapersdir)" "$(DESTDIR)$(xsessiondir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(defaultsdir)" "$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(lxpaneldir)" "$(DESTDIR)$(lxpanel_paneldir)" "$(DESTDIR)$(openboxdir)" "$(DESTDIR)$(pcmanfmdir)" "$(DESTDIR)$(wallpapersdir)" "$(DESTDIR)$(xsessiondir)" "$(DESTDIR)$(xdgdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -877,7 +899,7 @@
 install-data-am: install-defaultsDATA install-imagesDATA \
 	install-lxpanelDATA install-lxpanel_panelDATA \
 	install-openboxDATA install-pcmanfmDATA install-wallpapersDATA \
-	install-xsessionDATA
+	install-xsessionDATA install-xdgDATA
 
 install-dvi: install-dvi-recursive
 
@@ -927,7 +949,7 @@
 	uninstall-imagesDATA uninstall-lxpanelDATA \
 	uninstall-lxpanel_panelDATA uninstall-openboxDATA \
 	uninstall-pcmanfmDATA uninstall-wallpapersDATA \
-	uninstall-xsessionDATA
+	uninstall-xsessionDATA uninstall-xdgDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 	install-am install-strip tags-recursive
@@ -945,7 +967,7 @@
 	install-info-am install-lxpanelDATA install-lxpanel_panelDATA \
 	install-man install-openboxDATA install-pcmanfmDATA \
 	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip install-wallpapersDATA install-xsessionDATA \
+	install-strip install-wallpapersDATA install-xsessionDATA install-xdgDATA \
 	installcheck installcheck-am installdirs installdirs-am \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
@@ -953,7 +975,7 @@
 	uninstall-defaultsDATA uninstall-imagesDATA \
 	uninstall-lxpanelDATA uninstall-lxpanel_panelDATA \
 	uninstall-openboxDATA uninstall-pcmanfmDATA \
-	uninstall-wallpapersDATA uninstall-xsessionDATA
+	uninstall-wallpapersDATA uninstall-xsessionDATA uninstall-xdgDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.