diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 41eaeaf89d8..012740fd6b5 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -1,17 +1,16 @@
-# $OpenBSD: Makefile,v 1.6 2006/09/18 11:40:07 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2006/10/21 11:29:47 robert Exp $
 
 COMMENT=	"tools to talk to GSM cellular phones"	
 
-VERSION=	0.6.12
+VERSION=	0.6.14
 DISTNAME=	gnokii-${VERSION}
-PKGNAME=	${DISTNAME}p1
 CATEGORIES=	comms x11
 SHARED_LIBS=	gnokii	2.7
 
 MAINTAINER=	Robert Nagy <robert@openbsd.org>
 
 HOMEPAGE=	http://www.gnokii.org/
-MASTER_SITES=	${HOMEPAGE}download/gnokii/0.6.x/
+MASTER_SITES=	${HOMEPAGE}download/gnokii/
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -22,13 +21,14 @@ PERMIT_DISTFILES_FTP=	Yes
 FLAVORS=		no_x11
 FLAVOR?=
 
-WANTLIB=		c
+WANTLIB=		c iconv intl
 
 USE_LIBTOOL=		Yes
 USE_GMAKE=		Yes
 NO_REGRESS=		Yes
 
 CONFIGURE_STYLE=	gnu
+CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl"
 CONFIGURE_ARGS=		--enable-security \
 			--disable-debug \
 			--disable-xdebug \
@@ -43,7 +43,8 @@ WANTLIB+=		X11 Xext Xpm Xrender fontconfig freetype z \
 			gmodule-2.0.>=400.8 gobject-2.0.>=400.8 \
 			pango-1.0.>=600.0 pangoft2-1.0.>=600.0 \
 			pangocairo-1.0 cairo glitz png
-LIB_DEPENDS=		gtk-x11-2.0.>=400.13,gdk-x11-2.0.>=400.13,gdk_pixbuf-2.0.>=400.13::x11/gtk+2
+LIB_DEPENDS=		gtk-x11-2.0.>=400.13,gdk-x11-2.0.>=400.13,gdk_pixbuf-2.0.>=400.13::x11/gtk+2 \
+			usb.>=8::devel/libusb
 .endif
 
 post-install:
diff --git a/comms/gnokii/distinfo b/comms/gnokii/distinfo
index 2d38758df6c..47a284312c8 100644
--- a/comms/gnokii/distinfo
+++ b/comms/gnokii/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnokii-0.6.12.tar.gz) = d33fb1cfb637b4b9f98a63fdd99b3d05
-RMD160 (gnokii-0.6.12.tar.gz) = a8d89e080a148331b42d944cf3ca7264de651773
-SHA1 (gnokii-0.6.12.tar.gz) = 7e9620d26e0db8053169449578c40adac6bfd72a
-SIZE (gnokii-0.6.12.tar.gz) = 2098320
+MD5 (gnokii-0.6.14.tar.gz) = 041424aaecde8a77f62d84da92fb09ec
+RMD160 (gnokii-0.6.14.tar.gz) = 96cee1d89a92507e463707e392fbe43587711edd
+SHA1 (gnokii-0.6.14.tar.gz) = aa4a879ef6461f453beff077a57df332b3a916bb
+SIZE (gnokii-0.6.14.tar.gz) = 2155924
diff --git a/comms/gnokii/patches/patch-include_gnokii_h b/comms/gnokii/patches/patch-include_gnokii_h
new file mode 100644
index 00000000000..0483d0c7a0f
--- /dev/null
+++ b/comms/gnokii/patches/patch-include_gnokii_h
@@ -0,0 +1,11 @@
+$OpenBSD: patch-include_gnokii_h,v 1.1 2006/10/21 11:29:47 robert Exp $
+--- include/gnokii.h.orig	Sat Oct 21 12:38:35 2006
++++ include/gnokii.h	Sat Oct 21 12:39:04 2006
+@@ -46,6 +46,7 @@
+ #  include <sys/time.h>
+ #elif defined(__svr4__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__MACH__)
+ #  include <inttypes.h>
++#  include <limits.h>
+ #  include <sys/time.h>
+ #elif defined(_MSC_VER) && defined(WIN32)
+ #  include <Winsock.h>	/* for struct timeval */
diff --git a/comms/gnokii/pkg/PLIST b/comms/gnokii/pkg/PLIST
index e7baece2f74..82392481c8f 100644
--- a/comms/gnokii/pkg/PLIST
+++ b/comms/gnokii/pkg/PLIST
@@ -1,10 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.2 2006/06/02 01:54:28 robert Exp $
+@comment $OpenBSD: PLIST,v 1.3 2006/10/21 11:29:47 robert Exp $
 %%SHARED%%
 !%%no_x11%%
 bin/gnokii
 bin/ppm2nokia
 bin/sendsms
 bin/todologo
+bin/waitcall
 include/gnokii/
 include/gnokii.h
 include/gnokii/bitmaps.h
@@ -19,6 +20,7 @@ include/gnokii/rlp-common.h
 include/gnokii/sms.h
 include/gnokii/statemachine.h
 include/gnokii/virtmodem.h
+include/gnokii/wappush.h
 lib/libgnokii.a
 lib/libgnokii.la
 lib/pkgconfig/