diff --git a/graphics/libqrencode/Makefile b/graphics/libqrencode/Makefile
index daeb42da020..442d6f90394 100644
--- a/graphics/libqrencode/Makefile
+++ b/graphics/libqrencode/Makefile
@@ -1,44 +1,41 @@
-# $OpenBSD: Makefile,v 1.5 2014/11/07 01:31:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2014/11/08 00:43:35 jturner Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		library for encoding data in a QR Code symbol
 
 DISTNAME=		qrencode-3.4.4
+REVISION=		0
 PKGNAME=		lib${DISTNAME}
 
-SHARED_LIBS +=  qrencode             1.0      # 3.1
+SHARED_LIBS +=  qrencode             1.0      # 3.4
 
 CATEGORIES=		graphics
 
-HOMEPAGE=		http://fukuchi.org/works/qrencode/index.en.html
+HOMEPAGE=		http://fukuchi.org/works/qrencode/
 
-# LGPLv2.1
+# LGPLv2.1+
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=		${HOMEPAGE:=/../}
+MASTER_SITES=		http://fukuchi.org/works/qrencode/
 
-WANTLIB += c m png z
+WANTLIB += c m png pthread z
 
 LIB_DEPENDS=		graphics/png
 
+# only needed for tests
+BUILD_DEPENDS=		converters/libiconv
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--disable-thread-safety \
 			--with-tools \
 			--with-tests \
 			--with-sdl-prefix=/no
-CONFIGURE_ENV+= 	png_CFLAGS="`pkg-config --cflags libpng`" \
+CONFIGURE_ENV+= 	LIBS=-pthread \
+			png_CFLAGS="`pkg-config --cflags libpng`" \
 			png_LIBS="`pkg-config --libs libpng`"
 
-TEST_TARGETS= 	test_qrinput test_bitstream test_estimatebit \
-			test_qrspec test_rs test_qrencode prof_qrencode \
-			test_split test_monkey
-
 do-test:
-.for r in ${TEST_TARGETS}
-	cd ${WRKSRC}/tests/ && ./$r
-.endfor
+	cd ${WRKSRC}/tests/ && ./test_all.sh
 
 .include <bsd.port.mk>