diff --git a/games/kbilliards/Makefile b/games/kbilliards/Makefile
index dcca5923578a..7cbcc461a07f 100644
--- a/games/kbilliards/Makefile
+++ b/games/kbilliards/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kbilliards
-PORTVERSION=	0.8.5
-PORTREVISION=	1
+PORTVERSION=	0.8.6
 CATEGORIES=	games kde
 MASTER_SITES=	http://www.hostnotfound.it/kbilliards/
 
@@ -16,8 +15,8 @@ COMMENT=	Funny billiards simulator game for KDE
 EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
 
 USE_BZIP2=	yes
-USE_REINPLACE=	yes
 USE_KDELIBS_VER=	3
+USE_PERL5_BUILD=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
@@ -29,4 +28,7 @@ CFLAGS+=	-Dsqrtl=sqrt
 CFLAGS+=	-Dround=rint
 .endif
 
+pre-configure:
+	@cd ${WRKSRC} && ${PERL} admin/am_edit
+
 .include <bsd.port.post.mk>
diff --git a/games/kbilliards/distinfo b/games/kbilliards/distinfo
index ed25c28e6fec..3b83d41f5e12 100644
--- a/games/kbilliards/distinfo
+++ b/games/kbilliards/distinfo
@@ -1,3 +1,3 @@
-MD5 (kbilliards-0.8.5.tar.bz2) = 605e541e10f2f81a4d1f4a066d5d9e32
-SHA256 (kbilliards-0.8.5.tar.bz2) = 5f6de07c7808f638d1b1caa446a8520d39506a954ac86626e82e271b8ce80f78
-SIZE (kbilliards-0.8.5.tar.bz2) = 1950376
+MD5 (kbilliards-0.8.6.tar.bz2) = 43f3cff1cf2806128c7b4f6ba195d41f
+SHA256 (kbilliards-0.8.6.tar.bz2) = da8abe8da3d72573a1de3aa63ee438d6fda0209025e8ece1d38b67226c33ae6c
+SIZE (kbilliards-0.8.6.tar.bz2) = 2015606
diff --git a/games/kbilliards/pkg-plist b/games/kbilliards/pkg-plist
index 02158c1c5d02..9a988a0a79d3 100644
--- a/games/kbilliards/pkg-plist
+++ b/games/kbilliards/pkg-plist
@@ -43,8 +43,9 @@ share/apps/kbilliards/sound/ballinhole.wav
 share/apps/kbilliards/sound/gameover.wav
 share/apps/kbilliards/sound/hitball.wav
 share/apps/kbilliards/sound/hitedge.wav
-share/apps/kbilliards/sound/music01.mp3
+share/apps/kbilliards/sound/music01.ogg
 share/apps/kbilliards/sound/shot.wav
+share/doc/HTML/en/kbilliards/common
 share/doc/HTML/en/kbilliards/index.cache.bz2
 share/doc/HTML/en/kbilliards/index.docbook
 share/icons/hicolor/16x16/apps/kbilliards.png
@@ -56,27 +57,8 @@ share/locale/cs/LC_MESSAGES/kbilliards.mo
 share/locale/fr/LC_MESSAGES/kbilliards.mo
 share/locale/it/LC_MESSAGES/kbilliards.mo
 share/locale/ru/LC_MESSAGES/kbilliards.mo
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@dirrm share/doc/HTML/en/kbilliards/common
 @dirrm share/doc/HTML/en/kbilliards
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
 @dirrm share/apps/kbilliards/sound
 @dirrm share/apps/kbilliards/maps
 @dirrm share/apps/kbilliards/balls
 @dirrm share/apps/kbilliards
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Games 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true