diff --git a/Makefile b/Makefile
index 649986c..2c3f80a 100644
--- a/Makefile
+++ b/Makefile
@@ -61,11 +61,15 @@ install:
 	$(INSTALL) profiles/kde-profile/kdeglobals $(DESTDIR)/etc/kde3
 	mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/kde-profile/share/config
 	$(INSTALL) $(wildcard profiles/kde-profile/share/config/*) $(DESTDIR)/usr/share/desktop-base/profiles/kde-profile/share/config
-	# XFCE setup; uses the more general XDG
+	# Xfce 4.4
 	mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/mcs_settings
 	$(INSTALL) $(wildcard profiles/xdg-config/xfce4/mcs_settings/*) $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/mcs_settings
+	$(INSTALL) $(wildcard profiles/xdg-config/xfce4/mcs_settings/*) $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/mcs_settings
 	mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4-session
 	$(INSTALL) $(wildcard profiles/xdg-config/xfce4-session/*) $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4-session
+	# Xfce 4.6
+	mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml
+	$(INSTALL) $(wildcard profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/*) $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml
 	# GNOME background descriptor
 	mkdir -p $(DESTDIR)/usr/share/gnome-background-properties
 	$(INSTALL) gnome-backgrounds.xml $(DESTDIR)/usr/share/gnome-background-properties/debian.xml
diff --git a/debian/changelog b/debian/changelog
index 5ff5553..7476c04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+desktop-base (5.0.4) UNRELEASED; urgency=low
+
+  * Add session and desktop config files for Xfce 4.6.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Fri, 27 Feb 2009 00:58:25 +0100
+
 desktop-base (5.0.3) unstable; urgency=medium
 
   * debian/preinst:
diff --git a/debian/copyright b/debian/copyright
index 990146c..3ad15c9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -66,7 +66,5 @@ licensed under the GPL.
     - SVG background, backgrounds/debian-blueish-wallpaper.svg.
     - PNG splash, splash/gnome-splash-curves.png.
 
-The GPL license can be found in plain text format, on Debian systems,
-at /usr/share/common-licenses/GPL.
-
-
+The GPL license (version 2) can be found in plain text format, on Debian
+systems, at /usr/share/common-licenses/GPL-2
diff --git a/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
new file mode 100644
index 0000000..deec10d
--- /dev/null
+++ b/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-desktop" version="1.0">
+  <property name="backdrop" type="empty">
+    <property name="screen0" type="empty">
+      <property name="monitor0" type="empty">
+        <property name="brightness" type="int" value="0"/>
+        <property name="color1" type="array">
+          <value type="uint" value="7936"/>
+          <value type="uint" value="16128"/>
+          <value type="uint" value="28416"/>
+          <value type="uint" value="65535"/>
+        </property>
+        <property name="color2" type="array">
+          <value type="uint" value="26880"/>
+          <value type="uint" value="34048"/>
+          <value type="uint" value="46848"/>
+          <value type="uint" value="65535"/>
+        </property>
+        <property name="color-style" type="int" value="1"/>
+        <property name="image-path" type="string" value="/usr/share/images/desktop-base/default"/>
+        <property name="image-style" type="int" value="4"/>
+        <property name="image-show" type="bool" value="true"/>
+        <property name="last-image" type="string" value="/usr/share/images/desktop-base/default"/>
+        <property name="last-single-image" type="string" value="/usr/share/images/desktop-base/default"/>
+      </property>
+    </property>
+  </property>
+</channel>
diff --git a/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
new file mode 100644
index 0000000..429c0bf
--- /dev/null
+++ b/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-session" version="1.0">
+  <property name="splash" type="empty">
+    <property name="Engine" type="string" value="simple"/>
+    <property name="engines" type="empty">
+      <property name="simple" type="empty">
+        <property name="Font" type="string" value="Sans 8"/>
+        <property name="BgColor" type="string" value="#004f79"/>
+        <property name="FgColor" type="string" value="#639fc0"/>
+        <property name="Image" type="string" value="/usr/share/images/desktop-base/desktop-splash"/>
+      </property>
+    </property>
+  </property>
+</channel>