diff --git a/devel/kdesdk2/Makefile b/devel/kdesdk2/Makefile
index 7c765f5472e3..10576491bc58 100644
--- a/devel/kdesdk2/Makefile
+++ b/devel/kdesdk2/Makefile
@@ -1,14 +1,27 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 09:08:05 skrll Exp $
-#
+# $NetBSD: Makefile,v 1.6 2001/11/13 21:16:54 jlam Exp $
 
 DISTNAME=	kdesdk-2.2.1
-CATEGORIES=	devel kde
-.include "../../x11/kde2/Makefile.part1"
+CATEGORIES=	devel
 COMMENT=	Support applications and tools used by KDE developers
 
-DEPENDS+=	kdebase-2.2.1:../../x11/kdebase2
-DEPENDS+=	db-2.7.7:../../databases/db
+.include "../../x11/kde2/Makefile.kde2"
 
-.include "../../x11/kde2/Makefile.part2"
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
 
+USE_BUILDLINK_ONLY=	YES
+LTCONFIG_OVERRIDE+=	${WRKSRC}/kapptemplate/admin/ltconfig
+
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_SRC=	# empty
+.if ${OPSYS} == "Linux"
+PLIST_SRC+=	${PKGDIR}/PLIST.kmtrace
+.endif
+PLIST_SRC+=	${PKGDIR}/PLIST
+
+.include "../../databases/db/buildlink.mk"
+.include "../../devel/libtool/buildlink.mk"
+.include "../../x11/kde2/buildlink.mk"
+.include "../../x11/kdebase2/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/kdesdk2/PLIST.kmtrace b/devel/kdesdk2/PLIST.kmtrace
new file mode 100644
index 000000000000..436e4140072b
--- /dev/null
+++ b/devel/kdesdk2/PLIST.kmtrace
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST.kmtrace,v 1.1 2001/11/13 21:16:54 jlam Exp $
+bin/kmtrace
+include/ktrace.h
+lib/libktrace.a
+lib/libktrace.la
+lib/libktrace.so
+lib/libktrace.so.1
+lib/libktrace.so.1.0
+share/kde/apps/kmtrace/kde.excludes
+@dirrm share/kde/apps/kmtrace
diff --git a/devel/kdesdk2/distinfo b/devel/kdesdk2/distinfo
index bc869b331eb1..34b3b7f6b966 100644
--- a/devel/kdesdk2/distinfo
+++ b/devel/kdesdk2/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/10/18 09:08:06 skrll Exp $
+$NetBSD: distinfo,v 1.5 2001/11/13 21:16:55 jlam Exp $
 
 SHA1 (kdesdk-2.2.1.tar.bz2) = 02fc109eb5e30538c9bfcd385bd52675c342aee0
 Size (kdesdk-2.2.1.tar.bz2) = 1077979 bytes
 SHA1 (patch-aa) = 769ed077dedc4fef0c3fbcfaa34f2e8d9c282c00
 SHA1 (patch-ab) = 7de80906c1240bd92202609c09237639657bc712
+SHA1 (patch-ac) = fb2552d33ccd40f8c0830695187e093612b9b88f
diff --git a/devel/kdesdk2/patches/patch-ac b/devel/kdesdk2/patches/patch-ac
new file mode 100644
index 000000000000..d6d0014db983
--- /dev/null
+++ b/devel/kdesdk2/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2001/11/13 21:16:55 jlam Exp $
+
+--- kstartperf/Makefile.in.orig	Fri Sep  7 20:49:17 2001
++++ kstartperf/Makefile.in
+@@ -238,7 +238,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libkstartperf_la_LIBADD = 
++libkstartperf_la_LIBADD = -lltdl
+ #>- libkstartperf_la_OBJECTS =  libkstartperf.lo
+ #>+ 1
+ libkstartperf_la_OBJECTS = libkstartperf.lo