diff --git a/x11/xfce4/xfce4-session/Makefile b/x11/xfce4/xfce4-session/Makefile
index d787df14f1b..c90cbcb18aa 100644
--- a/x11/xfce4/xfce4-session/Makefile
+++ b/x11/xfce4/xfce4-session/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.28 2009/03/08 17:16:53 landry Exp $
+# $OpenBSD: Makefile,v 1.29 2009/04/28 19:50:27 landry Exp $
 
-COMMENT=	xfce4 session manager
+COMMENT=	Xfce4 session manager
 
 XFCE_PROJECT=	xfce4-session
 
@@ -28,6 +28,8 @@ WANTLIB=	ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
 		gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \
 		pixman-1 png pthread startup-notification-1 xfce4util xml2 z
 
+FAKE_FLAGS=	settingsdir=${PREFIX}/share/examples/xfce4-session
+
 post-install:
 	${SUBST_CMD} -c ${FILESDIR}/README.OpenBSD \
 		${PREFIX}/share/xfce4/README.OpenBSD
diff --git a/x11/xfce4/xfce4-session/distinfo b/x11/xfce4/xfce4-session/distinfo
index 6148ae7be20..3208eb76869 100644
--- a/x11/xfce4/xfce4-session/distinfo
+++ b/x11/xfce4/xfce4-session/distinfo
@@ -1,5 +1,5 @@
-MD5 (xfce4/xfce4-session-4.6.0.tar.bz2) = eaCMNpYZbvMfyBhWWDFnBg==
-RMD160 (xfce4/xfce4-session-4.6.0.tar.bz2) = ngfVLoRWGMDu9pSuafKipmkyEzw=
-SHA1 (xfce4/xfce4-session-4.6.0.tar.bz2) = OGXja2kYAtdLPoaqpKO7LO/4ONo=
-SHA256 (xfce4/xfce4-session-4.6.0.tar.bz2) = lQzPhcdD9AuI00McqjJ5YnFTsEznub9eTd0flDHeRRc=
-SIZE (xfce4/xfce4-session-4.6.0.tar.bz2) = 1362667
+MD5 (xfce4/xfce4-session-4.6.1.tar.bz2) = dii+Qe01EaIM/1Zz2dOYWA==
+RMD160 (xfce4/xfce4-session-4.6.1.tar.bz2) = DKtKDKKw13GM3lRtmLrByHp7pPA=
+SHA1 (xfce4/xfce4-session-4.6.1.tar.bz2) = dg4Fv3N4NSGzzjTpGqGHx0AYq4w=
+SHA256 (xfce4/xfce4-session-4.6.1.tar.bz2) = /u0/kFO4MjNpciOiD5XKCtbv6f7f/MCY5JNaQl6Pnw4=
+SIZE (xfce4/xfce4-session-4.6.1.tar.bz2) = 1365247
diff --git a/x11/xfce4/xfce4-session/patches/patch-settings_Makefile_in b/x11/xfce4/xfce4-session/patches/patch-settings_Makefile_in
deleted file mode 100644
index fbbd7da7e08..00000000000
--- a/x11/xfce4/xfce4-session/patches/patch-settings_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-settings_Makefile_in,v 1.1 2009/03/08 17:16:53 landry Exp $
---- settings/Makefile.in.orig	Mon Jan 19 22:13:17 2009
-+++ settings/Makefile.in	Mon Jan 19 22:13:45 2009
-@@ -334,7 +334,7 @@ xfce4_session_settings_LDADD = \
- xfce4_session_settings_DEPENDENCIES = \
- 	$(top_builddir)/libxfsm/libxfsm-4.6.la
- 
--settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
-+settingsdir = $(prefix)/share/examples/xfce4-session/
- settings_DATA = xfce4-session.xml
- desktopdir = $(datadir)/applications
- desktop_in_files = xfce-session-settings.desktop.in
diff --git a/x11/xfce4/xfce4-session/pkg/PLIST b/x11/xfce4/xfce4-session/pkg/PLIST
index ad55afeac77..46cd04f4976 100644
--- a/x11/xfce4/xfce4-session/pkg/PLIST
+++ b/x11/xfce4/xfce4-session/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2009/03/08 17:16:53 landry Exp $
+@comment $OpenBSD: PLIST,v 1.14 2009/04/28 19:50:27 landry Exp $
 @conflict xfce4-toys-*
 %%SHARED%%
 @bin bin/xfce4-session
@@ -129,18 +129,14 @@ share/locale/mr/LC_MESSAGES/xfce4-session.mo
 share/locale/ms/
 share/locale/ms/LC_MESSAGES/
 share/locale/ms/LC_MESSAGES/xfce4-session.mo
-share/locale/nb_NO/
-share/locale/nb_NO/LC_MESSAGES/
-share/locale/nb_NO/LC_MESSAGES/xfce4-session.mo
+share/locale/nb/LC_MESSAGES/xfce4-session.mo
 share/locale/nl/LC_MESSAGES/xfce4-session.mo
 share/locale/pa/
 share/locale/pa/LC_MESSAGES/
 share/locale/pa/LC_MESSAGES/xfce4-session.mo
 share/locale/pl/LC_MESSAGES/xfce4-session.mo
+share/locale/pt/LC_MESSAGES/xfce4-session.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-session.mo
-share/locale/pt_PT/
-share/locale/pt_PT/LC_MESSAGES/
-share/locale/pt_PT/LC_MESSAGES/xfce4-session.mo
 share/locale/ro/LC_MESSAGES/xfce4-session.mo
 share/locale/ru/LC_MESSAGES/xfce4-session.mo
 share/locale/si/