diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index a94e45b3c8c1..a4605e4975ed 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	mixer.app
-PORTVERSION=	1.4.1
+PORTVERSION=	1.6.0
 CATEGORIES=	audio
-MASTER_SITES=	http://www.fukt.hk-r.se/~per/mixer/	
+MASTER_SITES=	http://www.fukt.bth.se/~per/mixer/
 DISTNAME=	Mixer.app-${PORTVERSION}
 
 MAINTAINER=	cpiazza@FreeBSD.org
 
-USE_IMAKE=	yes
 USE_XPM=	yes
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Mixer ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/Mixer.app ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/audio/mixer.app/distinfo b/audio/mixer.app/distinfo
index 99a65c03c86c..feefb7669384 100644
--- a/audio/mixer.app/distinfo
+++ b/audio/mixer.app/distinfo
@@ -1 +1 @@
-MD5 (Mixer.app-1.4.1.tar.gz) = 5b32d952a94e9df57c1c7d3856bbb7ef
+MD5 (Mixer.app-1.6.0.tar.gz) = 7446b8a898483df8aa097ab6188d2fb1
diff --git a/audio/mixer.app/files/patch-Makefile b/audio/mixer.app/files/patch-Makefile
new file mode 100644
index 000000000000..50447466854b
--- /dev/null
+++ b/audio/mixer.app/files/patch-Makefile
@@ -0,0 +1,13 @@
+--- Makefile.orig	Mon May 21 21:21:47 2001
++++ Makefile	Mon May 21 21:22:44 2001
+@@ -7,8 +7,8 @@
+ X11_BINDIR = /usr/X11R6/bin
+ 
+ CXX=c++
+-CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2 -I/usr/X11R6/include
+-LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11
++CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I${X11BASE}/include
++LDFLAGS += -L${X11BASE}/lib -lXpm -lXext -lX11
+ 
+ OBJECTS = Main.o Mixer.o Xpm.o
+ 
diff --git a/audio/mixer.app/files/patch-aa b/audio/mixer.app/files/patch-aa
deleted file mode 100644
index 99515a8b20c6..000000000000
--- a/audio/mixer.app/files/patch-aa
+++ /dev/null
@@ -1,9 +0,0 @@
---- Imakefile.bak	Sun Sep 24 01:19:13 2000
-+++ Imakefile	Sun Sep 24 01:19:32 2000
-@@ -12,5 +12,5 @@
- SRCS = Main.cc Mixer.cc Xpm.cc
- OBJS = Main.o Mixer.o Xpm.o
- 
--ComplexProgramTarget(Mixer)
-+ComplexProgramTargetNoMan(Mixer)
- 
diff --git a/audio/mixer.app/pkg-plist b/audio/mixer.app/pkg-plist
index 25a3ce9b905a..ef8ed535c9eb 100644
--- a/audio/mixer.app/pkg-plist
+++ b/audio/mixer.app/pkg-plist
@@ -1 +1 @@
-bin/Mixer
+bin/Mixer.app