diff --git a/desktop/lookandfeel/artwork-pisilinux-release/pspec.xml b/desktop/lookandfeel/artwork-pisilinux-release/pspec.xml
index af3c96f075..90fac1c398 100644
--- a/desktop/lookandfeel/artwork-pisilinux-release/pspec.xml
+++ b/desktop/lookandfeel/artwork-pisilinux-release/pspec.xml
@@ -35,7 +35,7 @@
             <Path fileType="data">/etc/X11/Xsession.d</Path>
         </Files>
         <AdditionalFiles>
-            <AdditionalFile target="/etc/X11/Xsession.d/35-example-content.sh" permission="0644" owner="root">35-example-content.sh</AdditionalFile>
+            <AdditionalFile target="/etc/X11/xinit/xinitrc.d/35-example-content.sh" permission="0755" owner="root">35-example-content.sh</AdditionalFile>
         </AdditionalFiles>
     </Package>
 
diff --git a/desktop/misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch b/desktop/misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch
new file mode 100644
index 0000000000..c193fc8344
--- /dev/null
+++ b/desktop/misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/366885
+http://bugs.gentoo.org/499940
+
+--- Makefile.am
++++ Makefile.am
+@@ -16,7 +16,7 @@
+ xdgdir=$(sysconfdir)/xdg
+ xdg_DATA=user-dirs.conf user-dirs.defaults
+ 
+-libraries = $(LIBINTL)
++libraries = $(LIBINTL) $(LIBICONV)
+ 
+ bin_PROGRAMS =					\
+ 	xdg-user-dirs-update			\
diff --git a/desktop/misc/xdg-user-dirs/files/xdg-user-dirs.sh b/desktop/misc/xdg-user-dirs/files/xdg-user-dirs.sh
index 6b67ec0d4e..520a713da5 100644
--- a/desktop/misc/xdg-user-dirs/files/xdg-user-dirs.sh
+++ b/desktop/misc/xdg-user-dirs/files/xdg-user-dirs.sh
@@ -1 +1,5 @@
-[ -x /usr/bin/xdg-user-dirs-update ] && /usr/bin/xdg-user-dirs-update
+#!/bin/sh
+# Set up user directories like ~/Desktop and ~/Music
+if [ -x /usr/bin/xdg-user-dirs-update ]; then
+  /usr/bin/xdg-user-dirs-update
+fi
diff --git a/desktop/misc/xdg-user-dirs/pspec.xml b/desktop/misc/xdg-user-dirs/pspec.xml
index 43dfdefb89..90117941f7 100644
--- a/desktop/misc/xdg-user-dirs/pspec.xml
+++ b/desktop/misc/xdg-user-dirs/pspec.xml
@@ -21,6 +21,7 @@
         <Patches>
             <Patch level="1">defaults.patch</Patch>
             <Patch level="0">tr.patch</Patch>
+            <Patch>xdg-user-dirs-0.15-libiconv.patch</Patch>
         </Patches>
     </Source>
 
@@ -35,7 +36,7 @@
             <Path fileType="man">/usr/share/man</Path>
         </Files>
         <AdditionalFiles>
-            <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/30-xdg-user-dirs.sh">xdg-user-dirs.sh</AdditionalFile>
+            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/60-xdg-user-dirs.sh">xdg-user-dirs.sh</AdditionalFile>
         </AdditionalFiles>
     </Package>