diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index a7613bdfba86..ac9f80f043b2 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -1,28 +1,44 @@
 # New ports collection makefile for:	aumix
-# Version required:    1.30.1
+# Version required:    2
 # Date created:        21 May 1999
 # Whom:                Chris Piazza <cpiazza@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	aumix-1.30.1
+DISTNAME=	aumix-2.1
 CATEGORIES=	audio
 MASTER_SITES=	http://jpj.net/~trevor/aumix/ \
 		http://jpj.net/~trevor/aumix/old/ \
 		ftp://aumix.sourceforge.net/pub/aumix/stable/ \
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/sound/mixers
 
 MAINTAINER=	cpiazza@FreeBSD.org
 
-LIB_DEPENDS=    intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+.if !defined(NO_X11)
+LIB_DEPENDS+=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+
+GLIB_CONFIG=	${LOCALBASE}/bin/glib12-config
+GTK_CONFIG=	${X11BASE}/bin/gtk12-config
+.endif
+
+MAN1=		aumix.1 xaumix.1
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include" \
 		--libdir="${LOCALBASE}/lib"
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
-
-MAN1=	aumix.1 xaumix.1
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GLIB_CONFIG="${GLIB_CONFIG}" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+.if defined(NO_X11)
+CONFIGURE_ARGS+=	--without-gtk
+.else
+pre-fetch:
+	@${ECHO_MSG} -n "To build this port without X11 (and without the GUI),"
+	@${ECHO_MSG} " define \"NO_X11\"."
+.endif
 
 .include <bsd.port.mk>
diff --git a/audio/aumix/distinfo b/audio/aumix/distinfo
index aad9dfceaf7b..280e70f85f1c 100644
--- a/audio/aumix/distinfo
+++ b/audio/aumix/distinfo
@@ -1 +1 @@
-MD5 (aumix-1.30.1.tar.gz) = c3cbf32e1a5ccacd1d5af2e41835fc5a
+MD5 (aumix-2.1.tar.gz) = fe4b493c8e87c2c8523f9fcc72391c08
diff --git a/audio/aumix/pkg-comment b/audio/aumix/pkg-comment
index c9ef574df10d..5217780d0bcb 100644
--- a/audio/aumix/pkg-comment
+++ b/audio/aumix/pkg-comment
@@ -1 +1 @@
-A full-screen ncurses-based audio mixer for the console
+A full-screen ncurses- or GTK-based audio mixer for the console
diff --git a/audio/aumix/pkg-descr b/audio/aumix/pkg-descr
index fa3b66c60bf4..3df0233b8b64 100644
--- a/audio/aumix/pkg-descr
+++ b/audio/aumix/pkg-descr
@@ -1,5 +1,7 @@
 A program for adjusting audio mixers from the command line or
 scripts, or interactively at the console or a terminal with a full-screen,
 ncurses-based interface and sysmouse(4) support.
 
+Can optionally be built with a GTK+-based interface.
+
 WWW: http://jpj.net/~trevor/aumix.html