diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index 943226486f0..8bbac05e5fd 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -3,14 +3,16 @@
 # Date created:		28 Jan 2000
 # Whom:			Kevin Lo <kevlo@openbsd.org>
 #
-# $OpenBSD: Makefile,v 1.10 2000/10/22 15:44:00 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2000/11/30 05:28:42 kevlo Exp $
 #
 
-DISTNAME=	xfce-3.4.4
+DISTNAME=	xfce-3.6.3
 CATEGORIES=	x11
-NEED_VERSION=	1.305
+NEED_VERSION=	1.340
 MASTER_SITES=	http://www.xfce.org/archive/
 
+HOMEPAGE=	http://www.xfce.org/
+
 MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
 
 PERMIT_PACKAGE_CDROM=	Yes
@@ -20,15 +22,14 @@ PERMIT_DISTFILES_FTP=	Yes
 
 LIB_DEPENDS=	Imlib.19::graphics/imlib \
 		gtk.1::x11/gtk+
-RUN_DEPENDS=	${LOCALBASE}/bin/esdplay::audio/esound
-
-GTK_CONFIG=	${LOCALBASE}/bin/gtk-config
+RUN_DEPENDS=	${LOCALBASE}/bin/sox::audio/sox
 
+USE_X11=	Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
-CONFIGURE_ARGS+=--with-xpm=${X11BASE}
+CONFIGURE_ARGS=	--with-xpm=${X11BASE} \
+		--with-conf-dir=${PREFIX}/lib/xfce	
 
 .include <bsd.port.mk>
diff --git a/x11/xfce/files/md5 b/x11/xfce/files/md5
index 7ae11426668..b6a7edc24a8 100644
--- a/x11/xfce/files/md5
+++ b/x11/xfce/files/md5
@@ -1,3 +1,3 @@
-MD5 (xfce-3.4.4.tar.gz) = 699346aa15fcba663223003f191419fc
-RMD160 (xfce-3.4.4.tar.gz) = 8a897dacaa0d1d93a640e9d0bc8f6908c03e70f6
-SHA1 (xfce-3.4.4.tar.gz) = d874940f6f4fbcdc16ad3e468412c1454b8d9831
+MD5 (xfce-3.6.3.tar.gz) = e42e017604edf8daa24417a28a218333
+RMD160 (xfce-3.6.3.tar.gz) = 0d2c147a1acd4dc4de7c28ae112a282db4dda495
+SHA1 (xfce-3.6.3.tar.gz) = 98fec6c67f6ede75375bb14bed672256b4bdcf04
diff --git a/x11/xfce/patches/patch-aa b/x11/xfce/patches/patch-aa
deleted file mode 100644
index dc01d0533a8..00000000000
--- a/x11/xfce/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.orig	Fri Jul 14 09:27:14 2000
-+++ configure	Sun Aug 13 11:13:21 2000
-@@ -5634,12 +5634,7 @@ else
-   XFCE_DIR="$datadir/xfce"
- fi
- 
--XFCE_CONFDIR=`echo $XFCE_CONFDIR | sed "s,\${prefix},${prefix},"`
--if test "x$sysconfdir" = "x\${prefix}/etc" -o "x$prefix" = "xNONE"; then
--  XFCE_CONFDIR="/usr/local/etc/xfce"
--else
--  XFCE_CONFDIR="$sysconfdir/xfce"
--fi
-+XFCE_CONFDIR="/usr/local/lib/xfce"
- 
- XFCE_LOCALE_DIR="$XFCE_DIR/locale"
- 
diff --git a/x11/xfce/patches/patch-libs_configure_h b/x11/xfce/patches/patch-libs_configure_h
new file mode 100644
index 00000000000..3372aff352e
--- /dev/null
+++ b/x11/xfce/patches/patch-libs_configure_h
@@ -0,0 +1,11 @@
+--- libs/configure.h.orig	Wed Nov 29 09:27:12 2000
++++ libs/configure.h	Wed Nov 29 09:28:42 2000
+@@ -22,7 +22,7 @@
+ #define CLOSE_STRING4 "quit"
+ 
+ /* #ifdef __alpha */
+-#if defined(__alpha) && !defined(linux)
++#if defined(__alpha) && !(defined(linux) || defined(__OpenBSD__))
+ #define NEEDS_ALPHA_HEADER
+ #undef BROKEN_SUN_HEADERS
+ #endif /* (__alpha) */
diff --git a/x11/xfce/patches/patch-ltconfig b/x11/xfce/patches/patch-ltconfig
new file mode 100644
index 00000000000..32c7eb9873e
--- /dev/null
+++ b/x11/xfce/patches/patch-ltconfig
@@ -0,0 +1,49 @@
+--- ltconfig.orig	Mon Aug 14 19:26:37 2000
++++ ltconfig	Wed Nov 29 18:04:59 2000
+@@ -1105,6 +1105,9 @@
+     with_gnu_ld=no
+   fi
+   ;;
++openbsd*)
++  with_gnu_ld=no
++  ;;
+ 
+ esac
+ 
+@@ -1402,10 +1405,18 @@
+     ;;
+ 
+   openbsd*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+-    hardcode_libdir_flag_spec='-R$libdir'
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
++    case "$host_os" in
++      openbsd2.[01234567])
++       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
++       hardcode_libdir_flag_spec='-R$libdir'
++      ;;
++      *)
++       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
++       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      ;;
++    esac
+     ;;
+ 
+   os2*)
+@@ -2021,13 +2032,10 @@
+ 
+ openbsd*)
+   version_type=sunos
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-    need_version=no
+-  fi
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  library_names_spec='${libname}${release}.so ${libname}.so'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
++  deplibs_check_method='pass_all'
+   ;;
+ 
+ os2*)
diff --git a/x11/xfce/patches/patch-scripts_xfhelp_in b/x11/xfce/patches/patch-scripts_xfhelp_in
new file mode 100644
index 00000000000..f5bfadc5054
--- /dev/null
+++ b/x11/xfce/patches/patch-scripts_xfhelp_in
@@ -0,0 +1,10 @@
+--- scripts/xfhelp.in.orig	Wed Nov 29 14:54:00 2000
++++ scripts/xfhelp.in	Wed Nov 29 14:54:17 2000
+@@ -19,7 +19,6 @@
+ #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ 
+-XFCE_DIR=
+ if [ "x$BROWSER" = "x" ]
+ then
+   BROWSER=netscape
diff --git a/x11/xfce/patches/patch-xflock b/x11/xfce/patches/patch-xflock
new file mode 100644
index 00000000000..1546f8f2f26
--- /dev/null
+++ b/x11/xfce/patches/patch-xflock
@@ -0,0 +1,9 @@
+--- scripts/xflock.orig	Wed Nov 29 12:31:58 2000
++++ scripts/xflock	Wed Nov 29 12:32:09 2000
+@@ -19,5 +19,5 @@
+ #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ 
+-xscreensaver-command -lock || xlock $*
++xlock $*
+ exit 0
diff --git a/x11/xfce/patches/patch-xfsound_Makefile_in b/x11/xfce/patches/patch-xfsound_Makefile_in
new file mode 100644
index 00000000000..d9db0ef2339
--- /dev/null
+++ b/x11/xfce/patches/patch-xfsound_Makefile_in
@@ -0,0 +1,11 @@
+--- xfsound/Makefile.in.orig	Wed Nov 29 11:35:17 2000
++++ xfsound/Makefile.in	Wed Nov 29 11:37:07 2000
+@@ -122,7 +122,7 @@
+ xfsound_SOURCES =  	xfsound_cb.c xfsound_cb.h 	xfsound.c xfsound.h 	xfdsp.c xfdsp.h
+ 
+ 
+-xfsound_LDADD = ../libs/libxfcecore.la ../libs/libxfwmcore.la @DMALLOC_LIB@ @GTK_LIBS@ @GDK_IMLIB_LIBS@ @GDK_PIXBUF_LIBS@ @INTLLIBS@ @LIBS@ ../libs/libxfwmcore.la ${X_LIBS} ${X_PRE_LIBS} -lXpm
++xfsound_LDADD = ../libs/libxfcecore.la ../libs/libxfwmcore.la @DMALLOC_LIB@ @GTK_LIBS@ @GDK_IMLIB_LIBS@ @GDK_PIXBUF_LIBS@ @INTLLIBS@ @LIBS@ ../libs/libxfwmcore.la ${X_LIBS} ${X_PRE_LIBS} -lXpm -lossaudio
+ 
+ 
+ xfsound_DEPENDENCIES = ../libs/libxfcecore.la ../libs/libxfwmcore.la
diff --git a/x11/xfce/patches/patch-xfsound_xfdsp_c b/x11/xfce/patches/patch-xfsound_xfdsp_c
new file mode 100644
index 00000000000..6f65537b7f8
--- /dev/null
+++ b/x11/xfce/patches/patch-xfsound_xfdsp_c
@@ -0,0 +1,21 @@
+--- xfsound/xfdsp.c.orig	Wed Nov 29 09:43:22 2000
++++ xfsound/xfdsp.c	Wed Nov 29 09:46:38 2000
+@@ -48,6 +48,9 @@
+ #if defined(linux)
+ #include <sys/soundcard.h>	/* guess :) */
+ #endif
++#if defined(__OpenBSD__)
++#include <soundcard.h>
++#endif
+ 
+ #include "xfdsp.h"
+ 
+@@ -62,7 +65,7 @@
+ 
+ int masterfd;
+ 
+-#if defined(linux)
++#if defined(linux) || defined(__OpenBSD__)
+ int
+ i_play (char *soundfile)
+ {
diff --git a/x11/xfce/patches/patch-xfsound_xfplay b/x11/xfce/patches/patch-xfsound_xfplay
new file mode 100644
index 00000000000..44c1c734cae
--- /dev/null
+++ b/x11/xfce/patches/patch-xfsound_xfplay
@@ -0,0 +1,8 @@
+--- xfsound/xfplay.orig	Wed Nov 29 09:24:25 2000
++++ xfsound/xfplay	Wed Nov 29 09:25:48 2000
+@@ -2,4 +2,4 @@
+ #
+ # This script is part of XFce
+ # "ossdsp" option submitted by "Sami Tikka" <sami.tikka@kolumbus.fi>
+-exec sox $1 -t ossdsp /dev/dsp
++exec sox $1 -t ossdsp /dev/sound
diff --git a/x11/xfce/patches/patch-xfwm_session_c b/x11/xfce/patches/patch-xfwm_session_c
new file mode 100644
index 00000000000..b601ea3033d
--- /dev/null
+++ b/x11/xfce/patches/patch-xfwm_session_c
@@ -0,0 +1,37 @@
+--- xfwm/session.c.orig	Thu Jul  6 22:23:16 2000
++++ xfwm/session.c	Wed Nov 29 11:53:22 2000
+@@ -577,8 +577,10 @@
+ callback_save_yourself2 (SmcConn sm_conn, SmPointer client_data)
+ {
+   char *path = NULL;
+-  char *filename = NULL;
+-  FILE *f = NULL;
++  char *filename;
++  FILE *f;
++  int fd;
++
+   Bool success = True;
+   struct passwd *pwd;
+ 
+@@ -589,16 +591,18 @@
+       path = pwd->pw_dir;
+     }
+ 
+-  filename = tempnam (path, ".fs-");
++  sprintf (filename, "path/.fs-XXXXXXXX");
++  fd = mkstemp (filename);
+ 
+   if (Scr.Options & SessionMgt)
+     {
+-      f = fopen (filename, "w");
++      f = fdopen (fd, "w");
+       success = save_session_state (sm_conn, filename, f);
+       fclose (f);
+     }
+-  if (!success)
++  if (!success || fd < 0)
+     xfwm_msg (WARN, "SaveSession", "Can't save session\n");
++  close (fd);
+   /* also save session for builtin session mgt, so user will get
+    * back to his environmnent even if he doesn't use ICE
+    */
diff --git a/x11/xfce/pkg/DESCR b/x11/xfce/pkg/DESCR
index fc80b384e37..b5a8e82cec3 100644
--- a/x11/xfce/pkg/DESCR
+++ b/x11/xfce/pkg/DESCR
@@ -8,4 +8,4 @@ manager for X11, a user friendly  interface for mouse configuration, a
 pager providing a miniature view of all XFce desktops, a clock/calendar 
 and at last but not least a filemanager, all sharing the same look'n feel.
 
-WWW: http://www.xfce.org/
+WWW: ${HOMEPAGE}
diff --git a/x11/xfce/pkg/PFRAG.shared b/x11/xfce/pkg/PFRAG.shared
new file mode 100644
index 00000000000..4a46c0c325d
--- /dev/null
+++ b/x11/xfce/pkg/PFRAG.shared
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1 2000/11/30 05:28:55 kevlo Exp $
+lib/gtk/themes/engines/libxfce.so
+DYNLIBDIR(%B)
diff --git a/x11/xfce/pkg/PLIST b/x11/xfce/pkg/PLIST
index 4207d75a755..212f701a186 100644
--- a/x11/xfce/pkg/PLIST
+++ b/x11/xfce/pkg/PLIST
@@ -1,10 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.3 2000/08/16 03:41:34 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.4 2000/11/30 05:28:55 kevlo Exp $
 bin/CDE2Xfcepal
 bin/startxfce
 bin/xfbd
 bin/xfce
 bin/xfce_remove
 bin/xfce_setup
+bin/xfce_upgrade
 bin/xfclock
 bin/xfgnome
 bin/xfhelp
@@ -14,24 +15,25 @@ bin/xfmouse
 bin/xfpager
 bin/xfplay
 bin/xfprint
+bin/xfrun
 bin/xfsound
 bin/xfterm
 bin/xftrash
 bin/xftree
 bin/xfwm
-lib/xfce/README.xfdefs.py
+%%SHARED%%
 lib/xfce/Xclients
 lib/xfce/fvwm2rc
 lib/xfce/fvwmrc
 lib/xfce/xfbdrc
 lib/xfce/xfce3rc
+lib/xfce/xfce3rc.cs
 lib/xfce/xfce3rc.hu
 lib/xfce/xfce3rc.ja
 lib/xfce/xfce3rc.ko
 lib/xfce/xfce3rc.zh_CN.GB2312
 lib/xfce/xfce3rc.zh_TW.Big5
 lib/xfce/xfclockrc
-lib/xfce/xfdefs.py
 lib/xfce/xfmouserc
 lib/xfce/xfsoundrc
 lib/xfce/xfwmrc
@@ -49,11 +51,32 @@ man/man1/xfmountdev.1
 man/man1/xfmouse.1
 man/man1/xfpager.1
 man/man1/xfprint.1
+man/man1/xfrun.1
 man/man1/xfsound.1
 man/man1/xfterm.1
 man/man1/xftrash.1
 man/man1/xftree.1
 man/man1/xfwm.1
+share/locale/ca/LC_MESSAGES/xfce.mo
+share/locale/cs/LC_MESSAGES/xfce.mo
+share/locale/da/LC_MESSAGES/xfce.mo
+share/locale/de/LC_MESSAGES/xfce.mo
+share/locale/es/LC_MESSAGES/xfce.mo
+share/locale/et/LC_MESSAGES/xfce.mo
+share/locale/fi/LC_MESSAGES/xfce.mo
+share/locale/fr/LC_MESSAGES/xfce.mo
+share/locale/gl/LC_MESSAGES/xfce.mo
+share/locale/hu/LC_MESSAGES/xfce.mo
+share/locale/it/LC_MESSAGES/xfce.mo
+share/locale/ja/LC_MESSAGES/xfce.mo
+share/locale/nl/LC_MESSAGES/xfce.mo
+share/locale/pl/LC_MESSAGES/xfce.mo
+share/locale/pt_BR/LC_MESSAGES/xfce.mo
+share/locale/ro/LC_MESSAGES/xfce.mo
+share/locale/ru/LC_MESSAGES/xfce.mo
+share/locale/sk/LC_MESSAGES/xfce.mo
+share/locale/sv/LC_MESSAGES/xfce.mo
+share/locale/zh/LC_MESSAGES/xfce.mo
 share/xfce/COPYING
 share/xfce/XFce3.logo
 share/xfce/backdrops/A-Little-Exercise-3.jpg
@@ -115,6 +138,7 @@ share/xfce/backdrops/Satin3.xpm
 share/xfce/backdrops/Sea.xpm
 share/xfce/backdrops/Sky.xpm
 share/xfce/backdrops/Sky2.xpm
+share/xfce/backdrops/Sky3.jpg
 share/xfce/backdrops/Slate.xpm
 share/xfce/backdrops/Soft.xpm
 share/xfce/backdrops/Softblue.xpm
@@ -147,8 +171,10 @@ share/xfce/backdrops/Wood2.xpm
 share/xfce/backdrops/Worm.xpm
 share/xfce/backdrops/Xfce.jpg
 share/xfce/backdrops/Xfce.xpm
+share/xfce/backdrops/Xfcemice.jpg
 share/xfce/help/help.gl.html
 share/xfce/help/help.html
+share/xfce/help/help.nl.html
 share/xfce/help/slogan.jpg
 share/xfce/help/title_legend.jpg
 share/xfce/help/xfbd.jpg
@@ -179,84 +205,49 @@ share/xfce/icons/3dpaint.xpm
 share/xfce/icons/ABC.xpm
 share/xfce/icons/AZ.xpm
 share/xfce/icons/AceKingCards.xpm
-share/xfce/icons/Animator.xpm
 share/xfce/icons/AntiVirus.xpm
 share/xfce/icons/ArtFolderEmpty.xpm
 share/xfce/icons/ArtFolderFull.xpm
 share/xfce/icons/BWDialogEdit.xpm
 share/xfce/icons/BWwidgets.xpm
-share/xfce/icons/BackUp.xpm
-share/xfce/icons/Ballon.xpm
 share/xfce/icons/BallotBox.xpm
-share/xfce/icons/Binoculars.xpm
-share/xfce/icons/Bomb.xpm
-share/xfce/icons/Bomb2.xpm
 share/xfce/icons/Book.xpm
-share/xfce/icons/Box_empty.xpm
-share/xfce/icons/Box_full.xpm
 share/xfce/icons/BulletHole.xpm
-share/xfce/icons/C++.xpm
-share/xfce/icons/C.xpm
-share/xfce/icons/CAD.xpm
-share/xfce/icons/CAD2.xpm
 share/xfce/icons/CDPlayer.xpm
 share/xfce/icons/CPUChip.xpm
 share/xfce/icons/Calculator.xpm
-share/xfce/icons/Camera.xpm
-share/xfce/icons/Cards.xpm
-share/xfce/icons/Chart.xpm
 share/xfce/icons/CheckMarkMonitor.xpm
 share/xfce/icons/ChiselChartSlide.xpm
 share/xfce/icons/Clock.xpm
 share/xfce/icons/ClosedPackageBox.xpm
 share/xfce/icons/ColoredCompactDisc.xpm
-share/xfce/icons/Colormap.xpm
-share/xfce/icons/CompactDisc.xpm
 share/xfce/icons/Connect.xpm
-share/xfce/icons/Copy.xpm
 share/xfce/icons/CrashCartoon.xpm
 share/xfce/icons/CylinderWrenchSpreadsheet.xpm
-share/xfce/icons/Database.xpm
 share/xfce/icons/DeskGlobe.xpm
 share/xfce/icons/Director.xpm
-share/xfce/icons/DiskCopy.xpm
+share/xfce/icons/Disk-Blue.xpm
 share/xfce/icons/DiskFloppy.xpm
 share/xfce/icons/DiskHammer.xpm
 share/xfce/icons/DiskHardDrive.xpm
 share/xfce/icons/DiskOptical.xpm
-share/xfce/icons/Disk_blue.xpm
 share/xfce/icons/DisketteBoxEmpty.xpm
 share/xfce/icons/DisketteBoxFull.xpm
-share/xfce/icons/Disks.xpm
 share/xfce/icons/Document.xpm
-share/xfce/icons/Drawing.xpm
-share/xfce/icons/Drawing2.xpm
-share/xfce/icons/Drawing3.xpm
-share/xfce/icons/Dynamite.xpm
-share/xfce/icons/Earth.xpm
 share/xfce/icons/Edit.xpm
-share/xfce/icons/Editres.xpm
 share/xfce/icons/Equation.xpm
 share/xfce/icons/EscherCube.xpm
 share/xfce/icons/EscherTriangle.xpm
-share/xfce/icons/Exit.xpm
-share/xfce/icons/FAX.xpm
 share/xfce/icons/FaxRecieved.xpm
 share/xfce/icons/FileAPP.xpm
 share/xfce/icons/FileManager.xpm
-share/xfce/icons/Film.xpm
-share/xfce/icons/Film2.xpm
 share/xfce/icons/FilmNegative.xpm
 share/xfce/icons/Folder.xpm
 share/xfce/icons/FolderDeposit.xpm
 share/xfce/icons/FolderOpen.xpm
 share/xfce/icons/Folders.xpm
-share/xfce/icons/FontDesigner.xpm
-share/xfce/icons/Fonts.xpm
-share/xfce/icons/Format.xpm
 share/xfce/icons/ForwardBackwardPagesBook.xpm
 share/xfce/icons/FreeBSD.xpm
-share/xfce/icons/Ftp.xpm
 share/xfce/icons/GIMP.xpm
 share/xfce/icons/Game.xpm
 share/xfce/icons/Gimp2.xpm
@@ -264,9 +255,6 @@ share/xfce/icons/Gnome-apps.xpm
 share/xfce/icons/Gnome-logo.xpm
 share/xfce/icons/Gnome-panel.xpm
 share/xfce/icons/GoldenSatelliteDish.xpm
-share/xfce/icons/Graph_bar.xpm
-share/xfce/icons/Graph_pie.xpm
-share/xfce/icons/Hammer.xpm
 share/xfce/icons/HandOpen.xpm
 share/xfce/icons/HandPointing.xpm
 share/xfce/icons/HandPointingLeft.xpm
@@ -275,99 +263,57 @@ share/xfce/icons/HandPunch.xpm
 share/xfce/icons/HandReach.xpm
 share/xfce/icons/Info.xpm
 share/xfce/icons/Interface.xpm
-share/xfce/icons/Key.xpm
 share/xfce/icons/Keys.xpm
 share/xfce/icons/KeysOnChain.xpm
 share/xfce/icons/LeatherEmptyBag.xpm
 share/xfce/icons/LeatherFullBag.xpm
 share/xfce/icons/Lightbulb.xpm
-share/xfce/icons/Lightning.xpm
-share/xfce/icons/Lock.xpm
 share/xfce/icons/MaelstromInFrame.xpm
-share/xfce/icons/Magnify.xpm
 share/xfce/icons/MagnifyGlas.xpm
 share/xfce/icons/Mail.xpm
 share/xfce/icons/MailboxGoldGradientBackground.xpm
-share/xfce/icons/Math4.xpm
-share/xfce/icons/Meter.xpm
 share/xfce/icons/MicroPhonePro.xpm
 share/xfce/icons/Monalisa.xpm
 share/xfce/icons/Mosaic.xpm
 share/xfce/icons/Mouse.xpm
-share/xfce/icons/Moviemaker2.xpm
-share/xfce/icons/Music.xpm
-share/xfce/icons/Music2.xpm
-share/xfce/icons/Netscape.xpm
 share/xfce/icons/Netscape3.xpm
 share/xfce/icons/NetscapeLogo.xpm
 share/xfce/icons/News.xpm
-share/xfce/icons/No_drag.xpm
 share/xfce/icons/OldBlueAddingMachine.xpm
-share/xfce/icons/Packer.xpm
-share/xfce/icons/Palette.xpm
 share/xfce/icons/Pen.xpm
-share/xfce/icons/Pencil.xpm
 share/xfce/icons/Pencils.xpm
 share/xfce/icons/Penguin.xpm
 share/xfce/icons/PhonePortable.xpm
 share/xfce/icons/PhoneTTOffhook.xpm
-share/xfce/icons/Plug.xpm
 share/xfce/icons/Postit.xpm
 share/xfce/icons/PrefsDock.xpm
 share/xfce/icons/Printer.xpm
-share/xfce/icons/Radar.xpm
 share/xfce/icons/RayTracedGear.xpm
-share/xfce/icons/Raytracer.xpm
-share/xfce/icons/Reader.xpm
 share/xfce/icons/RecycleLogo.xpm
-share/xfce/icons/Sound.xpm
-share/xfce/icons/SoundEditor.xpm
 share/xfce/icons/Stoplight.xpm
-share/xfce/icons/TEX.xpm
 share/xfce/icons/Tablet.xpm
-share/xfce/icons/Tapes.xpm
-share/xfce/icons/Telescope.xpm
-share/xfce/icons/Temperature.xpm
 share/xfce/icons/Terminal.xpm
 share/xfce/icons/TextEditor.xpm
-share/xfce/icons/Tic_tac_toe.xpm
-share/xfce/icons/Tick.xpm
-share/xfce/icons/Timer.xpm
-share/xfce/icons/Torus.xpm
 share/xfce/icons/TrueDie.xpm
 share/xfce/icons/View.xpm
 share/xfce/icons/Viewer.xpm
-share/xfce/icons/Warning.xpm
 share/xfce/icons/WordProcessing.xpm
-share/xfce/icons/WordProcessing2.xpm
-share/xfce/icons/WordProcessing3.xpm
 share/xfce/icons/XV.xpm
 share/xfce/icons/X_server.xpm
 share/xfce/icons/Xmix.xpm
 share/xfce/icons/Xterm.xpm
 share/xfce/icons/Xv.xpm
-share/xfce/locale/ca/LC_MESSAGES/xfce.mo
-share/xfce/locale/da/LC_MESSAGES/xfce.mo
-share/xfce/locale/de/LC_MESSAGES/xfce.mo
-share/xfce/locale/es/LC_MESSAGES/xfce.mo
-share/xfce/locale/et/LC_MESSAGES/xfce.mo
-share/xfce/locale/fi/LC_MESSAGES/xfce.mo
-share/xfce/locale/fr/LC_MESSAGES/xfce.mo
-share/xfce/locale/gl/LC_MESSAGES/xfce.mo
-share/xfce/locale/hu/LC_MESSAGES/xfce.mo
-share/xfce/locale/it/LC_MESSAGES/xfce.mo
-share/xfce/locale/ja/LC_MESSAGES/xfce.mo
-share/xfce/locale/nl/LC_MESSAGES/xfce.mo
-share/xfce/locale/pl/LC_MESSAGES/xfce.mo
-share/xfce/locale/ro/LC_MESSAGES/xfce.mo
-share/xfce/locale/ru/LC_MESSAGES/xfce.mo
-share/xfce/locale/sk/LC_MESSAGES/xfce.mo
-share/xfce/locale/sv/LC_MESSAGES/xfce.mo
-share/xfce/locale/zh/LC_MESSAGES/xfce.mo
 share/xfce/palettes/Alpine
+share/xfce/palettes/Aluminium
 share/xfce/palettes/Analog
 share/xfce/palettes/Anthracite
 share/xfce/palettes/Bahamas
+share/xfce/palettes/BeHappy
+share/xfce/palettes/BeHappy2
+share/xfce/palettes/BeHappy3
+share/xfce/palettes/BlueX
+share/xfce/palettes/BlueX2
+share/xfce/palettes/BlueX3
 share/xfce/palettes/Bronze
 share/xfce/palettes/Cheese
 share/xfce/palettes/Citrouille
@@ -377,26 +323,35 @@ share/xfce/palettes/Default
 share/xfce/palettes/Dolly
 share/xfce/palettes/Dust
 share/xfce/palettes/Fall
+share/xfce/palettes/Glass
 share/xfce/palettes/Golden
 share/xfce/palettes/Grayscale
 share/xfce/palettes/Ground
 share/xfce/palettes/Helice
 share/xfce/palettes/HiContrast
 share/xfce/palettes/HiTech
+share/xfce/palettes/HiTech2
 share/xfce/palettes/Iceland
+share/xfce/palettes/Liquid
+share/xfce/palettes/Liquid2
 share/xfce/palettes/Mauve
 share/xfce/palettes/Metal
 share/xfce/palettes/Military
+share/xfce/palettes/Modern
 share/xfce/palettes/Nature
 share/xfce/palettes/Netsy
 share/xfce/palettes/OldWood
+share/xfce/palettes/Pale
 share/xfce/palettes/Paper
 share/xfce/palettes/Plum
+share/xfce/palettes/Power
+share/xfce/palettes/Power2
 share/xfce/palettes/Prairie
 share/xfce/palettes/Salmon
 share/xfce/palettes/Salmon2
 share/xfce/palettes/Sand
 share/xfce/palettes/Silver
+share/xfce/palettes/Silver2
 share/xfce/palettes/Spring
 share/xfce/palettes/Standard
 share/xfce/palettes/Stellar
@@ -405,6 +360,7 @@ share/xfce/palettes/Sunny
 share/xfce/palettes/Symbiose
 share/xfce/palettes/TBlue
 share/xfce/palettes/Teal
+share/xfce/palettes/Tiny
 share/xfce/palettes/Tommy
 share/xfce/palettes/Troica
 share/xfce/palettes/Typhoon
@@ -462,6 +418,13 @@ share/xfce/sounds/zap01.wav
 share/xfce/sounds/zap02.wav
 share/xfce/sounds/zap03.wav
 share/xfce/sounds/zap04.wav
+share/xfce/textures/Aluminium.xpm
+share/xfce/textures/BlueX.xpm
+share/xfce/textures/Glass.xpm
+share/xfce/textures/Liquid.xpm
+share/xfce/textures/Modern.xpm
+share/xfce/textures/Power.xpm
+share/xfce/textures/Power2.xpm
 share/xfce/textures/bronze.xpm
 share/xfce/textures/cheese.xpm
 share/xfce/textures/craters.xpm
@@ -476,43 +439,6 @@ share/xfce/textures/stripe.xpm
 @dirrm share/xfce/textures
 @dirrm share/xfce/sounds
 @dirrm share/xfce/palettes
-@dirrm share/xfce/locale/zh/LC_MESSAGES
-@dirrm share/xfce/locale/zh
-@dirrm share/xfce/locale/sv/LC_MESSAGES
-@dirrm share/xfce/locale/sv
-@dirrm share/xfce/locale/sk/LC_MESSAGES
-@dirrm share/xfce/locale/sk
-@dirrm share/xfce/locale/ru/LC_MESSAGES
-@dirrm share/xfce/locale/ru
-@dirrm share/xfce/locale/ro/LC_MESSAGES
-@dirrm share/xfce/locale/ro
-@dirrm share/xfce/locale/pl/LC_MESSAGES
-@dirrm share/xfce/locale/pl
-@dirrm share/xfce/locale/nl/LC_MESSAGES
-@dirrm share/xfce/locale/nl
-@dirrm share/xfce/locale/ja/LC_MESSAGES
-@dirrm share/xfce/locale/ja
-@dirrm share/xfce/locale/it/LC_MESSAGES
-@dirrm share/xfce/locale/it
-@dirrm share/xfce/locale/hu/LC_MESSAGES
-@dirrm share/xfce/locale/hu
-@dirrm share/xfce/locale/gl/LC_MESSAGES
-@dirrm share/xfce/locale/gl
-@dirrm share/xfce/locale/fr/LC_MESSAGES
-@dirrm share/xfce/locale/fr
-@dirrm share/xfce/locale/fi/LC_MESSAGES
-@dirrm share/xfce/locale/fi
-@dirrm share/xfce/locale/et/LC_MESSAGES
-@dirrm share/xfce/locale/et
-@dirrm share/xfce/locale/es/LC_MESSAGES
-@dirrm share/xfce/locale/es
-@dirrm share/xfce/locale/de/LC_MESSAGES
-@dirrm share/xfce/locale/de
-@dirrm share/xfce/locale/da/LC_MESSAGES
-@dirrm share/xfce/locale/da
-@dirrm share/xfce/locale/ca/LC_MESSAGES
-@dirrm share/xfce/locale/ca
-@dirrm share/xfce/locale
 @dirrm share/xfce/icons
 @dirrm share/xfce/help
 @dirrm share/xfce/backdrops