diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index f5aff9f0a242..b82eec34dd46 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	jackit
-PORTVERSION=	0.102.20
-PORTREVISION=	1
+PORTVERSION=	0.102.28.20061216
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	jackit
-DISTNAME=	jack-audio-connection-kit-${PORTVERSION}
+MASTER_SITES=	http://www.rncbc.org/jack/ \
+		http://freebsd.unixfreunde.de/sources/
+DISTNAME=	jack-0.102.28.svn20061216
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	A low-latency audio server
@@ -26,8 +25,9 @@ LATEST_LINK=	jack
 CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}" LDFLAGS="-L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man/
 GNU_CONFIGURE=	yes
-USE_GETOPT_LONG=	yes
+USE_GETOPT_LONG=yes
 USE_LDCONFIG=	yes
 USE_GNOME=	pkgconfig gnometarget gnomehack
 
diff --git a/audio/jack/distinfo b/audio/jack/distinfo
index 1c7008da913f..b2e37a0f4f0b 100644
--- a/audio/jack/distinfo
+++ b/audio/jack/distinfo
@@ -1,3 +1,3 @@
-MD5 (jack-audio-connection-kit-0.102.20.tar.gz) = d6881555a8b4c923b4ec706832f0d776
-SHA256 (jack-audio-connection-kit-0.102.20.tar.gz) = e4506a9f46cd6fa4896e76482f17b7bddeeda3eb35add176d6db479e5c4f8530
-SIZE (jack-audio-connection-kit-0.102.20.tar.gz) = 761792
+MD5 (jack-0.102.28.svn20061216.tar.gz) = aea1e24e5ed3bff8e4283b202189496c
+SHA256 (jack-0.102.28.svn20061216.tar.gz) = 5405026bfb8d37381487135c28237c3e6aa18cc91e350d1c04e2d98ad96d05d3
+SIZE (jack-0.102.28.svn20061216.tar.gz) = 770203
diff --git a/audio/jack/files/patch-configure b/audio/jack/files/patch-configure
deleted file mode 100644
index f7dff60dd2d2..000000000000
--- a/audio/jack/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Dec  6 08:33:37 2006
-+++ configure	Wed Dec  6 08:35:19 2006
-@@ -23296,7 +23296,7 @@
- # the cached result to work around this problem.
- 
- READLINE_DEPS=""
--HAVE_READLINE="false"
-+HAVE_READLINE="true"
- #AC_CHECK_LIB(readline, readline, [:],
- #    [unset ac_cv_lib_readline_readline
- #     AC_CHECK_LIB(readline, readline, [READLINE_DEPS="-ltermcap"],
diff --git a/audio/jack/files/patch-libjack-midiport.c b/audio/jack/files/patch-libjack-midiport.c
index 8bc629bd6406..d1e475776cb5 100644
--- a/audio/jack/files/patch-libjack-midiport.c
+++ b/audio/jack/files/patch-libjack-midiport.c
@@ -1,9 +1,9 @@
---- libjack/midiport.c.orig	Wed Dec  6 08:05:17 2006
-+++ libjack/midiport.c	Wed Dec  6 08:05:56 2006
-@@ -72,7 +72,7 @@
+--- libjack/midiport.c.orig	Sat Dec 16 13:50:17 2006
++++ libjack/midiport.c	Fri Jan 19 00:25:32 2007
+@@ -77,7 +77,7 @@
  		(jack_midi_port_info_private_t *) port_buffer;
  	
- 	if (event_idx >= info->info.event_count)
+ 	if (event_idx >= info->event_count)
 -		return ENODATA;
 +		return ENOMSG;
  	
diff --git a/audio/jack/pkg-plist b/audio/jack/pkg-plist
index f156f93a8adb..f00dae5e06c7 100644
--- a/audio/jack/pkg-plist
+++ b/audio/jack/pkg-plist
@@ -98,5 +98,5 @@ libdata/pkgconfig/jack.pc
 %%DOCS%%@dirrm share/jack-audio-connection-kit/reference/html
 %%DOCS%%@dirrm share/jack-audio-connection-kit/reference
 %%DOCS%%@dirrm share/jack-audio-connection-kit
-@dirrm include/jack
 @dirrm lib/jack
+@dirrm include/jack