--- xdg-desktop-icon.bak	Sun Jun 24 20:57:56 2007
+++ xdg-desktop-icon	Thu Dec 11 04:50:10 2008
@@ -495,7 +495,8 @@
 esac
 
 my_umask=077
-desktop_dir="$HOME/Desktop"
+test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs
+desktop_dir=${XDG_DESKTOP_DIR:-$HOME/Desktop}
 desktop_dir_kde=`kde-config --userpath desktop 2> /dev/null`
 if gconftool-2 -g /apps/nautilus/preferences/desktop_is_home_dir 2> /dev/null | grep true > /dev/null; then
     desktop_dir_gnome="$HOME"