diff --git a/audio/emu10kx/Makefile b/audio/emu10kx/Makefile
index c30912576c20..724ee9831a47 100644
--- a/audio/emu10kx/Makefile
+++ b/audio/emu10kx/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	emu10kx
-PORTVERSION=	20050919
+PORTVERSION=	20051021
 CATEGORIES=	audio
 MASTER_SITES=	http://chibis.persons.gfk.ru/audigy/emu10kx/
-DISTNAME=	${PORTNAME}-2005-09-19
+DISTNAME=	${PORTNAME}-2005-10-21
 
 MAINTAINER=	michaels@sdf.lonestar.org
 COMMENT=	SBLive!, Audigy, and Audigy2 driver for FreeBSD
@@ -19,8 +19,11 @@ USE_BZIP2=	yes
 NO_PACKAGE=	should be recompiled for a particular FreeBSD kernel
 
 MAN8=	emuctrl.8
-PLIST_FILES=	sbin/emuctrl
-WRKSRC=	${WRKDIR}/${DISTNAME}a
+PLIST_FILES=	sbin/emuctrl etc/rc.d/emuctrl.sh
+WRKSRC=	${WRKDIR}/${DISTNAME}
+
+do-install:
+	@${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC} -DMODULES_WITH_WORLD install
 
 post-install:
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
diff --git a/audio/emu10kx/distinfo b/audio/emu10kx/distinfo
index 12c028db9c32..4d6354f4e3a9 100644
--- a/audio/emu10kx/distinfo
+++ b/audio/emu10kx/distinfo
@@ -1,2 +1,2 @@
-MD5 (emu10kx-2005-09-19.tar.bz2) = 710b275e176858b5b2478ca53a0ef35c
-SIZE (emu10kx-2005-09-19.tar.bz2) = 63868
+MD5 (emu10kx-2005-10-21.tar.bz2) = 823f13ae7513061fb6474328c0dc7690
+SIZE (emu10kx-2005-10-21.tar.bz2) = 70555
diff --git a/audio/emu10kx/pkg-deinstall b/audio/emu10kx/pkg-deinstall
index 7bc92fe166a6..351b8469a536 100644
--- a/audio/emu10kx/pkg-deinstall
+++ b/audio/emu10kx/pkg-deinstall
@@ -19,11 +19,16 @@ if [ ${RESULT} -eq 0 ]; then
 fi
 
 # Remove the driver
-rm /boot/kernel/$DRIVERNAME.ko
+rm /boot/modules/$DRIVERNAME.ko
 
 # Remove the driver from loader.conf
 grep ${DRIVERNAME}_load /boot/loader.conf > /dev/null 2>&1; RESULT=$?
 if [ ${RESULT} -eq 0 ]; then
 	sed -e /${DRIVERNAME}_load.*/d -i.orig /boot/loader.conf
 fi
+
+# Tell the user about the state files
+if [ -f /var/db/emu10kx0-state ]; then
+echo "If you will not be using this port anymore, please remove " /var/db/emu10kx[0-9]-state " manually."
+fi
 #============================================================
diff --git a/audio/emu10kx/pkg-descr b/audio/emu10kx/pkg-descr
index 7b30e2630963..cfaa361b0d1b 100644
--- a/audio/emu10kx/pkg-descr
+++ b/audio/emu10kx/pkg-descr
@@ -4,4 +4,6 @@ SBLive!, Audigy, and Audigy2 based cards.
 This is an alternate driver that you may use instead of the snd_emu10k1
 driver in the FreeBSD kernel.
 
+This driver was written by Yuriy Tsibizov.
+
 WWW: http://chibis.persons.gfk.ru/audigy/