diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 819665a9e9e..14316eef39a 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2007/02/11 00:56:57 steven Exp $
+# $OpenBSD: Makefile,v 1.12 2007/04/13 14:50:06 sturm Exp $
 
 COMMENT=	"tools to talk to GSM cellular phones"	
 
 VERSION=	0.6.14
 DISTNAME=	gnokii-${VERSION}
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	comms x11
 SHARED_LIBS +=	gnokii               2.7      # .3.0
 
@@ -40,11 +40,11 @@ CONFIGURE_ARGS+=	--without-x
 .else
 USE_X11=		Yes
 CONFIGURE_ARGS+=	--with-x
-WANTLIB+=		ICE SM X11 Xext Xpm Xrender fontconfig freetype z \
+WANTLIB+=		X11 Xau Xdmcp Xpm Xrender fontconfig freetype z \
 			iconv intl m pthread atk-1.0.>=800.0 glib-2.0.>=400.8 \
 			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
+			pangocairo-1.0 cairo glitz png expat
 LIB_DEPENDS=		gtk-x11-2.0.>=400.13,gdk-x11-2.0.>=400.13,gdk_pixbuf-2.0.>=400.13::x11/gtk+2
 .endif
 
diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile
index 6bc00591360..8b95888f4aa 100644
--- a/comms/jpilot-syncmal/Makefile
+++ b/comms/jpilot-syncmal/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2007/02/11 00:56:57 steven Exp $
+# $OpenBSD: Makefile,v 1.3 2007/04/13 14:50:06 sturm Exp $
 
 COMMENT=	"MAL plugin for J-Pilot"
 
 DISTNAME=	jpilot-syncmal-0.80
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	comms palm
 
 HOMEPAGE=	http://jasonday.home.att.net/code/syncmal/
@@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${HOMEPAGE}
 
-WANTLIB=	ICE SM X11 Xext Xrender fontconfig freetype m z \
+WANTLIB=	X11 Xau Xdmcp Xrender expat fontconfig freetype m z \
 		atk-1.0.>=1011 cairo.>=4 gdk-x11-2.0.>=802 \
 		gdk_pixbuf-2.0.>=802 glib-2.0.>=1000 glitz.>=1 \
 		gmodule-2.0.>=1000 gobject-2.0.>=1000 \
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index 8f07dad32b0..392f3a4eb79 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.41 2007/02/11 00:56:57 steven Exp $
+# $OpenBSD: Makefile,v 1.42 2007/04/13 14:50:06 sturm Exp $
 
 COMMENT=	"desktop organizer software for the palm pilot"
 
 DISTNAME=	jpilot-0.99.9
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	comms palm
 
 MASTER_SITES=	${HOMEPAGE}
@@ -18,11 +18,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	c crypto m ICE SM X11 Xext Xrender fontconfig freetype png.>=5 \
+WANTLIB=	c crypto m X11 Xau Xdmcp Xrender fontconfig freetype png.>=5 \
 		atk-1.0.>=800.0 gdk_pixbuf-2.0.>=400.14 cairo glitz z \
 		glib-2.0.>=400.8 gmodule-2.0.>=400.8 pangocairo-1.0 \
 		gobject-2.0.>=400.8 pango-1.0.>=600.0 \
-		pangoft2-1.0.>=600.0 pthread
+		pangoft2-1.0.>=600.0 pthread expat
 
 LIB_DEPENDS=	pisock.>=9::comms/pilot-link \
 		gtk-x11-2.0.>=400.13,gdk-x11-2.0.>=400.13,gdk_pixbuf-2.0.>=400.13::x11/gtk+2
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile
index 934bab76754..8753fc4e0c3 100644
--- a/comms/openobex/Makefile
+++ b/comms/openobex/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2006/10/28 11:19:20 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2007/04/13 14:50:06 sturm Exp $
 
 COMMENT=		"OBEX protocol implementation"
 DISTNAME=		openobex-1.0.1
-PKGNAME=		${DISTNAME}p2
+PKGNAME=		${DISTNAME}p3
 SHARED_LIBS +=	openobex             1.0      # .1.0
 
 CATEGORIES=		comms
@@ -13,7 +13,6 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=openobex/}