diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 924048329db..1a9b1b0fde7 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2007/10/16 12:44:50 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2007/10/17 14:37:34 ajacoutot Exp $
 
 COMMENT=	tools to talk to GSM cellular phones
 
-VERSION=	0.6.14
-DISTNAME=	gnokii-${VERSION}
-PKGNAME=	${DISTNAME}p4
+DISTNAME=	gnokii-0.6.14
+PKGNAME=	${DISTNAME}p5
 CATEGORIES=	comms x11
 SHARED_LIBS +=	gnokii               2.7      # .3.0
 
@@ -22,16 +21,15 @@ PERMIT_DISTFILES_FTP=	Yes
 FLAVORS=		no_x11
 FLAVOR?=
 
-WANTLIB=		c iconv intl
+WANTLIB=		c
 
 USE_LIBTOOL=		Yes
 USE_GMAKE=		Yes
-NO_REGRESS=		Yes
 
 MODULES=		devel/gettext
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl"
+CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=		--enable-security \
 			--disable-debug \
 			--disable-xdebug \
@@ -65,4 +63,7 @@ post-install:
 		${PREFIX}/man/man1/xgnokii.1
 .endif
 
+do-regress:
+	cd ${WRKSRC}/testsuite && ./testit
+
 .include <bsd.port.mk>
diff --git a/comms/gnokii/patches/patch-configure b/comms/gnokii/patches/patch-configure
new file mode 100644
index 00000000000..b25371813b6
--- /dev/null
+++ b/comms/gnokii/patches/patch-configure
@@ -0,0 +1,23 @@
+$OpenBSD: patch-configure,v 1.1 2007/10/17 14:37:34 ajacoutot Exp $
+--- configure.orig	Wed Oct 17 13:24:31 2007
++++ configure	Wed Oct 17 13:25:45 2007
+@@ -32748,7 +32748,7 @@ s,@LIBOBJS@,$LIBOBJS,;t t
+ s,@SET_RELOCATABLE@,$SET_RELOCATABLE,;t t
+ s,@RELOCATABLE_VIA_LD_TRUE@,$RELOCATABLE_VIA_LD_TRUE,;t t
+ s,@RELOCATABLE_VIA_LD_FALSE@,$RELOCATABLE_VIA_LD_FALSE,;t t
+-s,@LIBICONV@,$LIBICONV,;t t
++s,@LIBICONV@,$LTLIBICONV,;t t
+ s,@LTLIBICONV@,$LTLIBICONV,;t t
+ s,@SET_MAKE@,$SET_MAKE,;t t
+ s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
+@@ -32774,8 +32774,8 @@ s,@INSTOBJEXT@,$INSTOBJEXT,;t t
+ s,@GENCAT@,$GENCAT,;t t
+ s,@INTLOBJS@,$INTLOBJS,;t t
+ s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
+-s,@INTLLIBS@,$INTLLIBS,;t t
+-s,@LIBINTL@,$LIBINTL,;t t
++s,@INTLLIBS@,$LTLIBINTL,;t t
++s,@LIBINTL@,$LTLIBINTL,;t t
+ s,@LTLIBINTL@,$LTLIBINTL,;t t
+ s,@POSUB@,$POSUB,;t t
+ s,@acx_pthread_config@,$acx_pthread_config,;t t
diff --git a/comms/gnokii/patches/patch-testsuite_testit b/comms/gnokii/patches/patch-testsuite_testit
new file mode 100644
index 00000000000..8f988e45bab
--- /dev/null
+++ b/comms/gnokii/patches/patch-testsuite_testit
@@ -0,0 +1,21 @@
+$OpenBSD: patch-testsuite_testit,v 1.1 2007/10/17 14:37:34 ajacoutot Exp $
+--- testsuite/testit.orig	Mon Aug 28 00:36:54 2006
++++ testsuite/testit	Wed Oct 17 13:40:52 2007
+@@ -1,15 +1,10 @@
+-#!/bin/bash
+-(
+-	cd ..
+-	./configure --disable-shared
+-	make || ( echo "*** Compile FAILED"; sleep 10 )
+-)
++#!/bin/sh
+ export HOME=`pwd`
+ GNOKII=../gnokii/gnokii
+ for A in test.0.identify test.1.sms test.10.oplogo test.11.ringtone test.13.emspicture test.14.oplogo-xpm test.16.imelody test.17.picture2 test.18.emsanimation test.2.concatsms; do
+     echo -n "Doing $A... "
+     B=`echo $A | sed s/test/out/`
+-    source $A 2>&1 | grep -v ^GNOKII | grep -v '^Doing operation' > my$B
++    . $A 2>&1 | grep -v ^GNOKII | grep -v '^Doing operation' > my$B
+     if cmp my$B $B > /dev/null 2>&1; then
+ 	echo ok
+     else