diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 15dc1d0166b..cd140001a45 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2010/11/17 08:05:14 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2011/11/13 17:15:59 ajacoutot Exp $
 
 COMMENT =	digital camera command-line interface
 CATEGORIES =	graphics
 
 MAINTAINER =	Marc Espie <espie@openbsd.org>
 
-VERSION =	2.4.7
+VERSION =	2.4.11
 DISTNAME =	gphoto2-${VERSION}
 PKGNAME =	gphoto-${VERSION}
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM =		Yes
 PERMIT_DISTFILES_FTP =		Yes
 PERMIT_DISTFILES_CDROM =	Yes
 
+WANTLIB += c exif gphoto2 gphoto2_port jpeg ltdl m ncurses popt
+WANTLIB += pthread readline usb usb-1.0
 
 USE_LIBTOOL =		Yes
 USE_GROFF =		Yes
@@ -26,17 +28,19 @@ USE_GROFF =		Yes
 MAKE_FLAGS =		INTLLIBS='$$(LTLIBINTL)'
 
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS =		--without-aalib --without-cdk
+CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
+			--without-aalib \
+			--without-cdk
 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib" \
 			POPT_CFLAGS="-I${LOCALBASE}/include" \
 			POPT_LIBS="-I${LOCALBASE}/lib -lpopt"
 
 MODULES =	devel/gettext
-LIB_DEPENDS =	graphics/libgphoto2 \
-		graphics/jpeg \
+LIB_DEPENDS =	graphics/libgphoto2>=2.4.11 \
 		devel/popt
 
-WANTLIB =	c exif m ncurses readline ltdl pthread usb \
-		gphoto2 gphoto2_port jpeg popt
+pre-configure:
+	perl -pi -e 's,-lpthread,-pthread,g' ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/graphics/gphoto2/distinfo b/graphics/gphoto2/distinfo
index ac607949c44..dfa2f3b1947 100644
--- a/graphics/gphoto2/distinfo
+++ b/graphics/gphoto2/distinfo
@@ -1,5 +1,5 @@
-MD5 (gphoto2-2.4.7.tar.gz) = 9QPQOI0ov4GF2pT74jGwIg==
-RMD160 (gphoto2-2.4.7.tar.gz) = i6U7qKGz4tVE0uogcH4l8jm1qoY=
-SHA1 (gphoto2-2.4.7.tar.gz) = Fe+gXr14KpExmya1H3pNmAtMDVY=
-SHA256 (gphoto2-2.4.7.tar.gz) = g1SXdHnPsaly6boivn9q1BZBZs2A1pjqytBO6QPsOlw=
-SIZE (gphoto2-2.4.7.tar.gz) = 908200
+MD5 (gphoto2-2.4.11.tar.gz) = eFpa4QBAE6OLy34mY6Ptow==
+RMD160 (gphoto2-2.4.11.tar.gz) = l2FmXlvCm7vNWpIw9Uc83vpjXgI=
+SHA1 (gphoto2-2.4.11.tar.gz) = tZsiviqaodEZ1S0r4KPlTBAH7Q8=
+SHA256 (gphoto2-2.4.11.tar.gz) = htC9ujly9S5SkFk45/Z01njk3dg0VKvBKFHoFVCXukQ=
+SIZE (gphoto2-2.4.11.tar.gz) = 939154
diff --git a/graphics/gphoto2/patches/patch-configure b/graphics/gphoto2/patches/patch-configure
deleted file mode 100644
index d5cdc7cee8a..00000000000
--- a/graphics/gphoto2/patches/patch-configure
+++ /dev/null
@@ -1,31 +0,0 @@
-$OpenBSD: patch-configure,v 1.5 2009/11/09 08:05:16 ajacoutot Exp $
---- configure.orig	Fri Aug 21 08:34:50 2009
-+++ configure	Sun Nov  8 19:32:33 2009
-@@ -15563,13 +15563,13 @@ $as_echo "$ac_cv_header_pthread_h" >&6; }
- fi
- if test "x$ac_cv_header_pthread_h" = x""yes; then
- 
--                { $as_echo "$as_me:$LINENO: checking for pthread_exit in -lpthread" >&5
--$as_echo_n "checking for pthread_exit in -lpthread... " >&6; }
-+                { $as_echo "$as_me:$LINENO: checking for pthread_exit in -pthread" >&5
-+$as_echo_n "checking for pthread_exit in -pthread... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_exit+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -15635,8 +15635,8 @@ cat >>confdefs.h <<\_ACEOF
- #define HAVE_PTHREAD 1
- _ACEOF
- 
--                    pthread_msg="yes (-lpthread)"
--                    PTHREAD_LIBS="-lpthread"
-+                    pthread_msg="yes (-pthread)"
-+                    PTHREAD_LIBS="-pthread"
- else
- 
-                     { $as_echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5