diff --git a/x11/xfce4/libxfcegui4/Makefile b/x11/xfce4/libxfcegui4/Makefile
index 1beb1d4d4c9..0fd04b1c189 100644
--- a/x11/xfce4/libxfcegui4/Makefile
+++ b/x11/xfce4/libxfcegui4/Makefile
@@ -1,13 +1,10 @@
-# $OpenBSD: Makefile,v 1.31 2010/11/22 08:37:05 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2011/01/18 20:16:18 landry Exp $
 
 COMMENT=	Xfce4 widget library
 
 XFCE_PROJECT=	libxfcegui4
-XFCE_VERSION=	4.6.4
-REVISION=	1
 
-SHARED_LIBS=	xfcegui4	5.0	\
-		xfce4kbd-private	5.0	# 6.5
+SHARED_LIBS=	xfcegui4	5.0
 
 HOMEPAGE=	http://www.xfce.org/projects/libraries
 
@@ -19,17 +16,18 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 
-LIB_DEPENDS=	x11/xfce4/xfconf \
+CONFIGURE_ARGS+=	--disable-linker-opts
+LIB_DEPENDS=	x11/xfce4/libxfce4util>=4.8.0 \
 		devel/startup-notification \
 		devel/libglade2
 
 WANTLIB=	ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
-		Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo dbus-1 dbus-glib-1 \
+		Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo \
 		expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \
 		glib-2.0 gmodule-2.0 gobject-2.0  gtk-x11-2.0 m pango-1.0 \
 		pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png xfce4util xml2 z \
 		pthread-stubs xcb execinfo xcb-atom xcb-aux xcb-event glade-2.0 \
-		gthread-2.0 xcb-render xcb-render-util xfconf-0 startup-notification-1
+		gthread-2.0 xcb-render startup-notification-1 GL Xxf86vm drm xcb-shm
 
 FAKE_FLAGS=	settingsdir=${PREFIX}/share/examples/xfconf
 
diff --git a/x11/xfce4/libxfcegui4/distinfo b/x11/xfce4/libxfcegui4/distinfo
index a937d40a15d..f6c2e3a6f5e 100644
--- a/x11/xfce4/libxfcegui4/distinfo
+++ b/x11/xfce4/libxfcegui4/distinfo
@@ -1,5 +1,5 @@
-MD5 (xfce4/libxfcegui4-4.6.4.tar.bz2) = iN5ZsiLLmXf5OkxhARweHw==
-RMD160 (xfce4/libxfcegui4-4.6.4.tar.bz2) = TXkMOZA3KqglgUUOGyot/TbfKTs=
-SHA1 (xfce4/libxfcegui4-4.6.4.tar.bz2) = oSx5+PoUxdH8D8pWFaRRt9I/hpU=
-SHA256 (xfce4/libxfcegui4-4.6.4.tar.bz2) = w35AfcAPuH3BZ1jVPmnt6sezKqdsX8rSt4TPIvWK9CE=
-SIZE (xfce4/libxfcegui4-4.6.4.tar.bz2) = 669219
+MD5 (xfce4/libxfcegui4-4.8.0.tar.bz2) = dP57gQUUUHhfqCcK7R5uXA==
+RMD160 (xfce4/libxfcegui4-4.8.0.tar.bz2) = YvreZlNAxtLv6+Q2YW8ndrMTYJE=
+SHA1 (xfce4/libxfcegui4-4.8.0.tar.bz2) = EKrH34y8wCRlrnkrSB7hbpSKZIg=
+SHA256 (xfce4/libxfcegui4-4.8.0.tar.bz2) = aSEg6nMY/aHoLZ9VMIG3sM+VmvjjqMoICCKco9TB1UU=
+SIZE (xfce4/libxfcegui4-4.8.0.tar.bz2) = 674799
diff --git a/x11/xfce4/libxfcegui4/pkg/PFRAG.shared b/x11/xfce4/libxfcegui4/pkg/PFRAG.shared
index a4ee41d8dc9..a913dedc4c0 100644
--- a/x11/xfce4/libxfcegui4/pkg/PFRAG.shared
+++ b/x11/xfce4/libxfcegui4/pkg/PFRAG.shared
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.6 2009/03/08 17:11:44 landry Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.7 2011/01/18 20:16:18 landry Exp $
 lib/libglade/2.0/libxfce4.so
-@lib lib/libxfce4kbd-private.so.${LIBxfce4kbd-private_VERSION}
 @lib lib/libxfcegui4.so.${LIBxfcegui4_VERSION}
diff --git a/x11/xfce4/libxfcegui4/pkg/PLIST b/x11/xfce4/libxfcegui4/pkg/PLIST
index cce1c7d228e..54bbba0503e 100644
--- a/x11/xfce4/libxfcegui4/pkg/PLIST
+++ b/x11/xfce4/libxfcegui4/pkg/PLIST
@@ -1,12 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.13 2010/06/05 15:22:13 landry Exp $
+@comment $OpenBSD: PLIST,v 1.14 2011/01/18 20:16:18 landry Exp $
 @conflict xfce4-panel-<4.4.1
 %%SHARED%%
 include/xfce4/
-include/xfce4/libxfce4kbd-private/
-include/xfce4/libxfce4kbd-private/xfce-shortcut-dialog.h
-include/xfce4/libxfce4kbd-private/xfce-shortcuts-grabber.h
-include/xfce4/libxfce4kbd-private/xfce-shortcuts-provider.h
-include/xfce4/libxfce4kbd-private/xfce-shortcuts.h
 include/xfce4/libxfcegui4/
 include/xfce4/libxfcegui4/dialogs.h
 include/xfce4/libxfcegui4/gtk_style.h
@@ -57,20 +52,10 @@ lib/libglade/
 lib/libglade/2.0/
 lib/libglade/2.0/libxfce4.a
 lib/libglade/2.0/libxfce4.la
-lib/libxfce4kbd-private.a
-lib/libxfce4kbd-private.la
 lib/libxfcegui4.a
 lib/libxfcegui4.la
 lib/pkgconfig/
-lib/pkgconfig/libxfce4kbd-private-1.0.pc
 lib/pkgconfig/libxfcegui4-1.0.pc
-share/examples/xfconf/
-@sample ${SYSCONFDIR}/xdg/
-@sample ${SYSCONFDIR}/xdg/xfce4/
-@sample ${SYSCONFDIR}/xdg/xfce4/xfconf/
-@sample ${SYSCONFDIR}/xdg/xfce4/xfconf/xfce-perchannel-xml/
-share/examples/xfconf/xfce4-keyboard-shortcuts.xml
-@sample ${SYSCONFDIR}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
 share/gtk-doc/
 share/gtk-doc/html/
 share/gtk-doc/html/libxfcegui4/
@@ -170,6 +155,9 @@ share/locale/ja/LC_MESSAGES/libxfcegui4.mo
 share/locale/ka/
 share/locale/ka/LC_MESSAGES/
 share/locale/ka/LC_MESSAGES/libxfcegui4.mo
+share/locale/kk/
+share/locale/kk/LC_MESSAGES/
+share/locale/kk/LC_MESSAGES/libxfcegui4.mo
 share/locale/ko/LC_MESSAGES/libxfcegui4.mo
 share/locale/ku/
 share/locale/ku/LC_MESSAGES/
@@ -205,6 +193,9 @@ share/locale/sv/LC_MESSAGES/libxfcegui4.mo
 share/locale/ta/
 share/locale/ta/LC_MESSAGES/
 share/locale/ta/LC_MESSAGES/libxfcegui4.mo
+share/locale/tl_PH/
+share/locale/tl_PH/LC_MESSAGES/
+share/locale/tl_PH/LC_MESSAGES/libxfcegui4.mo
 share/locale/tr/LC_MESSAGES/libxfcegui4.mo
 share/locale/ug/
 share/locale/ug/LC_MESSAGES/