diff --git a/x11/gnome/controlcenter/Makefile b/x11/gnome/controlcenter/Makefile
index 126179f6070..4b34762729f 100644
--- a/x11/gnome/controlcenter/Makefile
+++ b/x11/gnome/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2011/11/02 17:48:29 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.49 2011/11/05 14:07:43 ajacoutot Exp $
 
 # XXX Binary files patch-panels_info_hostnames-test_txt and
 # patch-panels_info_hostnames-test_txt.new differ
@@ -10,7 +10,7 @@ COMMENT=		GNOME control center
 
 GNOME_PROJECT=		gnome-control-center
 GNOME_VERSION=		3.2.1
-REVISION=		3
+REVISION=		4
 
 SHARED_LIBS +=  gnome-control-center      0.0 # 1.0
 
@@ -38,7 +38,7 @@ WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
 WANTLIB += png polkit-gobject-1 pthread pthread-stubs pulse pulse-mainloop-glib
 WANTLIB += rest-0.7 sndfile soup-2.4 soup-gnome-2.4 sqlite3 ssl
 WANTLIB += stdc++ vorbis vorbisfile webkitgtk-3.0 xcb xcb-render
-WANTLIB += xcb-shm xkbfile xklavier xml2 xslt z
+WANTLIB += xcb-shm xkbfile xklavier xml2 xslt z upower-glib
 
 MODULES=		devel/gettext \
 			x11/gnome
@@ -109,10 +109,8 @@ FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples/gnome-control-center \
 # * gnome-media-panel needs udev to take appropriate action on device
 #   plug (see patch-schemas_org_gnome_desktop_media-handling_gschema_xml_in_in
 #   in devel/gsettings-desktop-schemas).
-# * gnome-power-panel needs a fully working gnome-power-manager
-#   (userland cannot be made aware of power/button events yet).
 # * gnome-wacom-panel needs device detection support and gnome-bluetooth
-DISABLED_PLUGINS= media power wacom
+DISABLED_PLUGINS= media wacom
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/panels/printers/cc-printers-panel.c
diff --git a/x11/gnome/controlcenter/pkg/PLIST b/x11/gnome/controlcenter/pkg/PLIST
index 0c3235836cf..cb63994d054 100644
--- a/x11/gnome/controlcenter/pkg/PLIST
+++ b/x11/gnome/controlcenter/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.20 2011/11/02 16:43:00 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.21 2011/11/05 14:07:43 ajacoutot Exp $
 @conflict control-center-1*
 @conflict control-center2-*
 @conflict gnome-media-<2.91.2p3
@@ -24,6 +24,8 @@ lib/control-center-1/panels/libkeyboard.so
 lib/control-center-1/panels/libmouse-properties.so
 @comment lib/control-center-1/panels/libonline-accounts.la
 lib/control-center-1/panels/libonline-accounts.so
+@comment lib/control-center-1/panels/libpower.la
+lib/control-center-1/panels/libpower.so
 @comment lib/control-center-1/panels/libprinters.la
 lib/control-center-1/panels/libprinters.so
 @comment lib/control-center-1/panels/libregion.la
@@ -48,6 +50,7 @@ share/applications/gnome-info-panel.desktop
 share/applications/gnome-keyboard-panel.desktop
 share/applications/gnome-mouse-panel.desktop
 share/applications/gnome-online-accounts-panel.desktop
+share/applications/gnome-power-panel.desktop
 share/applications/gnome-printers-panel.desktop
 share/applications/gnome-region-panel.desktop
 share/applications/gnome-screen-panel.desktop
@@ -221,6 +224,7 @@ share/gnome-control-center/ui/gnome-region-panel.ui
 share/gnome-control-center/ui/info.ui
 share/gnome-control-center/ui/language-chooser.ui
 share/gnome-control-center/ui/online-accounts.ui
+share/gnome-control-center/ui/power.ui
 share/gnome-control-center/ui/printers/
 share/gnome-control-center/ui/printers/new-printer-dialog.ui
 share/gnome-control-center/ui/printers/printers.ui