diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 60a9ca9d085..102b9c1d3ef 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.8 2007/05/09 11:38:09 bernd Exp $
+# $OpenBSD: Makefile,v 1.9 2007/06/04 19:33:17 espie Exp $
 
 CATEGORIES=	multimedia x11 x11/kde
 COMMENT=	'video player for kde'
 
 HOMEPAGE=	http://kaffeine.sourceforge.net/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kaffeine/}
-DISTNAME=	kaffeine-0.8.3
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	kaffeine-0.8.4
+PKGNAME=	${DISTNAME}
 EXTRACT_SUFX=	.tar.bz2
 
 		
@@ -41,7 +41,9 @@ LIB_DEPENDS=		kdecore.>=7,DCOP,kdesu,kio,kdefx,kparts,kutils,kdeprint,kdeui,kwal
 
 WANTLIB=	X11 ICE Xrender SM Xext freetype Xinerama \
 		util m pthread z c stdc++ \
-		pcre pcreposix iconv jpeg ogg png idn intl art_lgpl_2
+		pcre pcreposix iconv jpeg ogg png idn intl art_lgpl_2 \
+	        Xau Xdmcp Xtst fam rpcsvc
+
 
 PERMIT_DISTFILES_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
diff --git a/multimedia/kaffeine/distinfo b/multimedia/kaffeine/distinfo
index 2d8b2aeebf0..9d8ecc61634 100644
--- a/multimedia/kaffeine/distinfo
+++ b/multimedia/kaffeine/distinfo
@@ -1,5 +1,5 @@
-MD5 (kaffeine-0.8.3.tar.bz2) = Zn3VbPAvE0OzpGamha/fJA==
-RMD160 (kaffeine-0.8.3.tar.bz2) = 8iqXFIHo/RqWBj/vZtFW0RnB5ZY=
-SHA1 (kaffeine-0.8.3.tar.bz2) = YZj/5ZQiEkhVAHpCRD4qafZFHmY=
-SHA256 (kaffeine-0.8.3.tar.bz2) = QnGfTqtqJ6Buwkc2lCT1qdeW/KdGclc8Rn0CSYOoYbI=
-SIZE (kaffeine-0.8.3.tar.bz2) = 2940941
+MD5 (kaffeine-0.8.4.tar.bz2) = b2Lrt6b4j/SfRShWoWYNlQ==
+RMD160 (kaffeine-0.8.4.tar.bz2) = /Wopao5Yp6EWXpGw+M7Tf9qWj/0=
+SHA1 (kaffeine-0.8.4.tar.bz2) = A9KoPRB/gBsQxwL3ULuVrRvvNEs=
+SHA256 (kaffeine-0.8.4.tar.bz2) = oVrZ9rFU7xyD89DoGPlO/Xumwq5Oav/MnSivrLcB33Q=
+SIZE (kaffeine-0.8.4.tar.bz2) = 2903979
diff --git a/multimedia/kaffeine/patches/patch-configure_in b/multimedia/kaffeine/patches/patch-configure_in
deleted file mode 100644
index 6dc7c176e58..00000000000
--- a/multimedia/kaffeine/patches/patch-configure_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.3 2007/04/07 16:29:15 espie Exp $
---- configure.in.orig	Sun Nov 26 20:28:33 2006
-+++ configure.in	Sat Apr  7 17:58:32 2007
-@@ -242,7 +242,7 @@ dnl --------------------
- dnl check for cdparanoia
- dnl --------------------
- 
--AC_CHECK_HEADER([cdda_interface.h], [with_cdparanoia=yes], [with_cdparanoia=no])
-+KDE_CHECK_HEADER([cdda_interface.h], [with_cdparanoia=yes], [with_cdparanoia=no])
- 
- if test "$with_cdparanoia" != "yes" ; then
- 	echo ""
diff --git a/multimedia/kaffeine/pkg/PLIST b/multimedia/kaffeine/pkg/PLIST
index e6283acba34..c74a1b865e6 100644
--- a/multimedia/kaffeine/pkg/PLIST
+++ b/multimedia/kaffeine/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2006/12/04 01:20:31 espie Exp $
+@comment $OpenBSD: PLIST,v 1.5 2007/06/04 19:33:17 espie Exp $
 bin/kaffeine
 include/kaffeine/
 include/kaffeine/kaffeineaudioencoder.h
@@ -37,6 +37,8 @@ share/apps/konqueror/servicemenus/kaffeine_play_dvd.desktop
 share/apps/konqueror/servicemenus/kaffeine_play_vcd.desktop
 share/apps/profiles/
 share/apps/profiles/kaffeine.profile.xml
+@comment share/doc/HTML/en/doc/
+@comment share/doc/HTML/en/doc/CMakeLists.txt
 share/doc/HTML/en/kaffeine/
 share/doc/HTML/en/kaffeine/common
 share/doc/HTML/en/kaffeine/discwindow.png