diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 1eee11eff34..21bab800281 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2004/05/10 00:58:45 brad Exp $
+# $OpenBSD: Makefile,v 1.33 2004/08/10 09:14:47 xsa Exp $
 
 COMMENT=	"Gtk-based graphic file viewer"
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MODULES=	gettext
+MODULES=	devel/gettext
 
 LIB_DEPENDS+=	png.2::graphics/png \
 		gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 3f9edfa9e34..4cc93afc0d7 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/06/15 15:59:40 sturm Exp $
+# $OpenBSD: Makefile,v 1.2 2004/08/10 09:14:47 xsa Exp $
 
 COMMENT=	"digital camera frontend"
 
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	:pkgconfig->=0.9.0:devel/pkgconfig
 LIB_DEPENDS=	gphoto2,gphoto2_port::graphics/libgphoto2 \
 		gdk_pixbuf-2.0.0.11,gdk-x11-2.0.0.11,gtk-x11-2.0.0.11::x11/gtk+2
 
-MODULES=	iconv
+MODULES=	converters/libiconv
 
 SEPARATE_BUILD=	concurrent
 
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index 4600b2d31e6..a4d1ff95c2e 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2004/04/14 22:33:07 brad Exp $
+# $OpenBSD: Makefile,v 1.22 2004/08/10 09:14:47 xsa Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
@@ -21,7 +21,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 LIB_DEPENDS=	kdecore.6,DCOP,kdefx,kdeprint,kdesu,kparts,kdeui,kio::x11/kde/libs3
 
-MODULES=	kde
+MODULES=	x11/kde
 
 PORTHOME=	${WRKDIR}
 
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 1952e5b243d..4eef366102e 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2003/11/14 23:52:42 brad Exp $
+# $OpenBSD: Makefile,v 1.47 2004/08/10 09:14:47 xsa Exp $
 # $FreeBSD: Makefile,v 1.45 1999/03/09 01:08:57 nectar Exp $
 
 COMMENT=	"image manipulation library for X11"
@@ -9,7 +9,7 @@ PKGNAME=	imlib-${V}p2
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/imlib/1.9/}
 
-MODULES=	gettext
+MODULES=	devel/gettext
 LIB_DEPENDS= 	gtk.1.2,gdk.1.2::x11/gtk+ \
 		jpeg.62::graphics/jpeg \
 		ungif.5::graphics/libungif \
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index 5b053e22090..bd040663fcd 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2003/01/21 02:21:59 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2004/08/10 09:14:47 xsa Exp $
 
 COMMENT=	"extract digital camera info tags from JPEG images"
 
@@ -16,7 +16,7 @@ PERMIT_DISTFILES_FTP=   Yes
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libexif/}
 
-MODULES=	gettext
+MODULES=	devel/gettext
 SEPARATE_BUILD=	concurrent
 CONFIGURE_STYLE= gnu
 
diff --git a/korean/hanterm-xf/Makefile b/korean/hanterm-xf/Makefile
index 6aaf4c0209b..b0496ad18dc 100644
--- a/korean/hanterm-xf/Makefile
+++ b/korean/hanterm-xf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2004/01/25 21:10:50 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.7 2004/08/10 09:14:47 xsa Exp $
 
 COMMENT=	"XFree86-based xterm with Korean language support"
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE_FTP=	yes
 PERMIT_DISTFILES_CDROM=	yes
 PERMIT_DISTFILES_FTP=	yes
 
-MODULES=	iconv
+MODULES=	converters/libiconv
 
 USE_X11=	Yes
 
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 5ee78241424..1ab0d4e8cf0 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2004/08/01 21:19:17 naddy Exp $
+# $OpenBSD: Makefile,v 1.21 2004/08/10 09:14:47 xsa Exp $
 
 ONLY_FOR_ARCHS=	i386
 
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clisp/}
 EXTRACT_SUFX=	.tar.bz2
 
-MODULES=	gettext
+MODULES=	devel/gettext
 
 CONFIGURE_STYLE=gnu old
 CONFIGURE_ARGS=	--srcdir=${WRKSRC} ${WRKBUILD}
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 90456d1ab3c..ca8d7dd1df5 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2004/02/01 12:54:15 wilfried Exp $
+# $OpenBSD: Makefile,v 1.7 2004/08/10 09:14:47 xsa Exp $
 
 COMMENT=		"GNU awk"
 
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${MASTER_SITE_GNU:=gawk/}
 
-MODULES=		gettext
+MODULES=		devel/gettext
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 2794af2c3e8..e9b72221951 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2004/06/29 05:13:06 brad Exp $
+# $OpenBSD: Makefile,v 1.17 2004/08/10 09:14:47 xsa Exp $
 
 COMMENT=	"Emacs Lisp-like runtime library"
 
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=librep/}
 
 HOMEPAGE=	http://librep.sourceforge.net/
 
-MODULES=	gettext
+MODULES=	devel/gettext
 LIB_DEPENDS=	gdbm.2::databases/gdbm
 
 MAINTAINER=	Margarida Sequeira <margarida@openbsd.org>
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index e107da8f8cf..5d5427c1acd 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2004/07/30 17:40:27 brad Exp $
+# $OpenBSD: Makefile,v 1.11 2004/08/10 09:14:47 xsa Exp $
 
 COMMENT= 	"compact IMAP/POP3 server"
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MODULES=	iconv
+MODULES=	converters/libiconv
 
 CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.59
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index d65806c1d3a..43e6d6a787e 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2004/07/05 22:09:52 jolan Exp $
+# $OpenBSD: Makefile,v 1.14 2004/08/10 09:14:48 xsa Exp $
 
 COMMENT=		"integrated email and PIM software for GNOME"
 COMMENT-devguide=	"Evolution Developer's Guide"
@@ -25,7 +25,7 @@ MASTER_SITES0=		${HOMEPAGE}/update/snapshot/
 DISTFILES=		${DISTNAME}.tar.gz \
 			db-3.1.17.tar.gz:0
 
-MODULES=		gettext
+MODULES=		devel/gettext
 
 BUILD_DEPENDS=		:bison-*:devel/bison \
 			:scrollkeeper->=0.3.12:textproc/scrollkeeper
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index f0e57becae4..643fe97a19b 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2004/07/26 10:56:01 peter Exp $
+# $OpenBSD: Makefile,v 1.44 2004/08/10 09:14:48 xsa Exp $
 
 COMMENT=	"Flexible mail transfer agent"
 VERSION=	4.41
@@ -57,7 +57,7 @@ LIB_DEPENDS+=		ldap.2,lber:openldap-client-2.*:databases/openldap
 .endif
 
 .if ${FLAVOR:L:Miconv}
-MODULES=		iconv
+MODULES=		converters/libiconv
 EXIM_MAKECAT+=		"HAVE_ICONV=yes\n"
 EXIM_EXTRA_LIBS+=	-L${LOCALBASE}/lib -liconv
 EXIM_CFLAGS+=		-I${LOCALBASE}/include
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 920d6156446..a762086e675 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.98 2003/10/15 23:08:49 fgsch Exp $
+# $OpenBSD: Makefile,v 1.99 2004/08/10 09:14:48 xsa Exp $
 
 COMMENT=	"mail retrieval utility for POP2, POP3, KPOP, IMAP and more"
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MODULES=	gettext
+MODULES=	devel/gettext
 
 SEPARATE_BUILD=	concurrent
 CONFIGURE_STYLE= gnu
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 4a690d90971..b644987d4d7 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2004/03/02 23:48:16 brad Exp $
+# $OpenBSD: Makefile,v 1.15 2004/08/10 09:14:48 xsa Exp $
 
 COMMENT=		"new mail notification utility for KDE"
 
@@ -20,7 +20,7 @@ MASTER_SITES=		http://devel-home.kde.org/~granroth/kbiff/
 LIB_DEPENDS=		kdecore.4,kio,kdeui,kdefx,kdesu,DCOP::x11/kde/libs3
 
 MODKDE_VERSION= 	3.1
-MODULES=        	kde
+MODULES=        	x11/kde
 
 MAKE_ENV=		KDEDIR="${LOCALBASE}"
 MAKE_FLAGS=		${MODKDE_MAKE_FLAGS}
diff --git a/mail/mutt/Makefile.inc b/mail/mutt/Makefile.inc
index bd45d4d29a0..e0b01a3ee9f 100644
--- a/mail/mutt/Makefile.inc
+++ b/mail/mutt/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.4 2004/06/28 14:17:21 lebel Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2004/08/10 09:14:48 xsa Exp $
 
 DISTNAME=	mutt-${VERSION}i
 CATEGORIES=	mail
@@ -11,7 +11,7 @@ MASTER_SITES1=	http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/
 
 HOMEPAGE=	http://www.mutt.org/
 
-MODULES=	gettext
+MODULES=	devel/gettext
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index eef353224b8..43428f778de 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2004/06/26 04:58:55 naddy Exp $
+# $OpenBSD: Makefile,v 1.8 2004/08/10 09:14:48 xsa Exp $
 
 COMMENT=		"enhanced, MIME capable Berkeley Mail"
 
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=nail/}
 EXTRACT_SUFX=		.tar.bz2
 
-MODULES=		iconv
+MODULES=		converters/libiconv
 
 SEPARATE_BUILD=		simple
 CONFIGURE_STYLE=	autoconf
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index d246c03fc67..fb69fefb72b 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2004/08/02 16:08:24 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2004/08/10 09:14:48 xsa Exp $
 
 COMMENT=		"lightweight GTK+ based mail/news client"
 COMMENT-dillo=		"Dillo plugin for sylpheed-claws"
@@ -25,7 +25,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
 DISTFILES=		$(DISTNAME).tar.bz2 \
 			$(THEMEFILE).tar.gz
 
-MODULES=		gettext
+MODULES=		devel/gettext
 LIB_DEPENDS=		gdk.1,gtk.1::x11/gtk+ \
 			gthread.1::devel/glib
 
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 9fe2842e51e..232ffaa0292 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2002/10/23 07:16:11 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.7 2004/08/10 09:14:48 xsa Exp $
 
 COMMENT=	"simple program for plotting 2d mathematical functions"
 
@@ -21,7 +21,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MODULES=	gettext
+MODULES=	devel/gettext
 LIB_DEPENDS=	gtk.1.2::x11/gtk+ \
 		glib.1::devel/glib \
 		gdk_imlib::graphics/imlib
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 54a5b759ef2..d6637a6d29c 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2004/07/25 00:17:39 marcm Exp $
+# $OpenBSD: Makefile,v 1.8 2004/08/10 09:14:48 xsa Exp $
 
 COMMENT=		"spreadsheet application for GNOME"
 
@@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.2/}
 
-MODULES=		gettext
+MODULES=		devel/gettext
 
 BUILD_DEPENDS=		:pkgconfig-*:devel/pkgconfig \
 			:scrollkeeper-*:textproc/scrollkeeper \