diff --git a/audio/libworkman/Makefile b/audio/libworkman/Makefile
index 76d86a33a819..ebc5a06dd66a 100644
--- a/audio/libworkman/Makefile
+++ b/audio/libworkman/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libworkman
-# Date created:			8 August 1999
-# Whom:				Jim Mock <jim@FreeBSD.org>
-#
+# Created by: Jim Mock <jim@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libworkman
 PORTVERSION=	1.4
@@ -19,8 +15,8 @@ COMMENT=	Workman library required by some audio apps
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
+USES=		imake
 WRKSRC=		${WRKDIR}/libworkman
-USE_IMAKE=	yes
 USE_LDCONFIG=	yes
 CFLAGS+=	-fPIC
 
diff --git a/audio/workman/Makefile b/audio/workman/Makefile
index 2fa0de882da7..2ca75df94772 100644
--- a/audio/workman/Makefile
+++ b/audio/workman/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    workman
-# Date created:         25 Now 1995
-# Whom:                 Donald Burr <d_burr@ix.netcom.com>
-#
+# Created by: Donald Burr <d_burr@ix.netcom.com>
 # $FreeBSD$
-#
 
 PORTNAME=	workman
 PORTVERSION=	1.3a
@@ -19,15 +15,13 @@ COMMENT=	Open Look-based CD player tool
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 
 WRKSRC=		${WRKDIR}/workman
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 MAN1=		workman.1
 MAN5=		workmandb.5
 PLIST_FILES=	bin/workman lib/help/workman.info
 
-.include <bsd.port.pre.mk>
-
 post-install:
 	${GZIP_CMD} ${PREFIX}/man/man5/workmandb.5
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index 3211a4ba97db..1ed946857d07 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xmix
-# Date created:		30 June 1995
-# Whom:			janek@gaja.ipan.lublin.pl
-#
+# Created by: janek@gaja.ipan.lublin.pl
 # $FreeBSD$
-#
 
 PORTNAME=	xmix
 PORTVERSION=	2.1
@@ -19,7 +15,7 @@ PATCHFILES=	xmix-2.1.mixers.patch
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mixer for X Window System
 
-USE_IMAKE=	yes
+USES=		imake
 WRKSRC=		${WRKDIR}/xmix
 USE_XORG=	x11 xext xmu xaw xt sm ice
 
diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile
index fe39d9cac1e0..e24fbd47bd77 100644
--- a/audio/xmradio/Makefile
+++ b/audio/xmradio/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Motif based FM tuner (for use with bt848 driver)
 # useful if you are into digital audio recording and playback.
 #RUN_DEPENDS=   sox:${PORTSDIR}/audio/sox
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xpm
 USE_MOTIF=	yes
 ONLY_FOR_ARCHS=	i386 ia64