diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index d635095cd74..7d919465ae8 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2011/10/16 06:29:30 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2012/01/02 15:13:19 ajacoutot Exp $
 
 ONLY_FOR_ARCHS =${APM_ARCHS}
 
@@ -9,6 +9,8 @@ EXTRACT_SUFX =	.tar.xz
 CATEGORIES =	sysutils
 SHARED_LIBS +=  upower-glib               0.0 # 1.1
 
+REVISION =	0
+
 HOMEPAGE =	http://upower.freedesktop.org/
 MASTER_SITES =	${HOMEPAGE}/releases/
 
diff --git a/sysutils/upower/patches/patch-configure b/sysutils/upower/patches/patch-configure
index d658e76f314..e7007f362ae 100644
--- a/sysutils/upower/patches/patch-configure
+++ b/sysutils/upower/patches/patch-configure
@@ -1,16 +1,29 @@
-$OpenBSD: patch-configure,v 1.6 2011/10/16 06:29:30 ajacoutot Exp $
+$OpenBSD: patch-configure,v 1.7 2012/01/02 15:13:19 ajacoutot Exp $
+
+Disable --as-needed to prevent undefined symbol on pthread_*
 
 Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
 
 --- configure.orig	Wed Sep 28 17:04:39 2011
-+++ configure	Sun Oct 16 08:20:41 2011
-@@ -13967,6 +13967,9 @@ else
++++ configure	Mon Jan  2 16:09:11 2012
+@@ -13417,10 +13417,6 @@ else
  fi
  
-     ;;
+ 
+-if test "x$GCC" = "xyes"; then
+-  LDFLAGS="-Wl,--as-needed $LDFLAGS"
+-fi
+-
+ # i18n support
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+@@ -13966,6 +13962,9 @@ else
+   DATADIRNAME=lib
+ fi
+ 
++    ;;
 +    *-*-openbsd*)
 +    DATADIRNAME=share
-+    ;;
+     ;;
      *)
      DATADIRNAME=lib
-     ;;