diff --git a/net/edonkey-gui-gtk-kioslave/Makefile b/net/edonkey-gui-gtk-kioslave/Makefile
index f771817048a3..5594eb5ed893 100644
--- a/net/edonkey-gui-gtk-kioslave/Makefile
+++ b/net/edonkey-gui-gtk-kioslave/Makefile
@@ -14,32 +14,21 @@ MASTER_SITES=	http://users.aber.ac.uk/tpm01/ \
 		${MASTER_SITE_LOCAL:S/$/:kde_admin/}
 MASTER_SITE_SUBDIR=	lioux/:kde_admin
 PKGNAMESUFFIX=	-gui-gtk-kioslave
-DISTFILES=	ed2k_kde2_kioslave.tar.gz
+DISTFILES=	ed2k_kde2_kioslave.tar.gz \
+		kde-admindir-3.0.1.tar.gz:kde_admin
 
 MAINTAINER=	lioux@FreeBSD.org
 
+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
+		automake:${PORTSDIR}/devel/automake
 RUN_DEPENDS=	ed2k_gui:${PORTSDIR}/net/edonkey-gui-gtk
 
-.if exists(${X11BASE}/include/qt2/qapp.h)
-USE_KDELIBS_VER=	2
-.else
 USE_KDELIBS_VER=	3
-.endif
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/ed2kslave
 
-.include <bsd.port.pre.mk>
-
-.if ${USE_KDELIBS_VER} == 3
-DISTFILES+=	kde-admindir-3.0.1.tar.gz:kde_admin
-
-BUILD_DEPENDS+=	autoconf:${PORTSDIR}/devel/autoconf \
-		automake:${PORTSDIR}/devel/automake
-
-PLIST_SUB+=	KDEDIR_VERSION=kde3
-
 post-extract:
 	@${RM} -Rf ${WRKSRC}/admin
 	@${CP} -Rp ${WRKDIR}/admin ${WRKSRC}
@@ -48,10 +37,4 @@ pre-configure:
 	@${RM} -f ${WRKSRC}/config.cache
 	@cd ${WRKSRC} && ${GMAKE} -f admin/Makefile.common cvs || ${TRUE}
 
-.else
-
-PLIST_SUB+=	KDEDIR_VERSION=kde2
-
-.endif # ${USE_KDELIBS_VER} == 3
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/edonkey-gui-gtk-kioslave/pkg-plist b/net/edonkey-gui-gtk-kioslave/pkg-plist
index ec603dccbc2a..4342a1ac9223 100644
--- a/net/edonkey-gui-gtk-kioslave/pkg-plist
+++ b/net/edonkey-gui-gtk-kioslave/pkg-plist
@@ -1,3 +1,3 @@
-lib/%%KDEDIR_VERSION%%/kio_ed2kslave.la
-lib/%%KDEDIR_VERSION%%/kio_ed2kslave.so
+lib/kde3/kio_ed2kslave.la
+lib/kde3/kio_ed2kslave.so
 share/services/ed2kslave.protocol