diff --git a/x11/kde/base/Makefile b/x11/kde/base/Makefile
index bc3635c0ffc..1b93863defb 100644
--- a/x11/kde/base/Makefile
+++ b/x11/kde/base/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2000/03/24 23:28:40 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2000/03/25 13:59:50 kevlo Exp $
 # Original Author: Yanick Cote <yanick@fries.net>
 
 DISTNAME=	kdebase-1.1.2
@@ -15,7 +15,6 @@ LIB_DEPENDS=	qt.1.45::x11/qt \
 
 MAINTAINER=	brad@openbsd.org
 
-LICENSE_TYPE=		GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -24,6 +23,11 @@ PERMIT_DISTFILES_FTP=	Yes
 USE_BZIP2=	Yes
 USE_GMAKE=	Yes
 GNU_CONFIGURE=	Yes
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
+CONFIGURE_ARGS+= --prefix='$${DESTDIR}${PREFIX}' \
+                 --enable-static \
+                 --with-qt-includes=${LOCALBASE}/include/X11/qt \
+                 --with-qt-libraries=${LOCALBASE}/lib
 
 pre-build:
 	@echo ""
@@ -36,8 +40,8 @@ pre-build:
 
 KSS= kattraction.kss kbanner.kss kbat.kss kblankscrn.kss kblob.kss \
 kbouboule.kss kbsod.kss kflame.kss kforest.kss khop.kss klaser.kss \
-klines.kss klissie.kss kmorph3d.kss kpipes.kss kpolygon.kss kpyro.kss \
-krock.kss kscience.kss kslidescreen.kss kslip.kss kspace.kss kswarm.kss
+klines.kss klissie.kss kpolygon.kss kpyro.kss krock.kss kscience.kss \
+kslidescreen.kss kslip.kss kswarm.kss
 
 post-install:
 	@cd ${PREFIX}/bin && chmod u+s ${KSS}
diff --git a/x11/kde/base/pkg/PLIST b/x11/kde/base/pkg/PLIST
index 67a64ba5f3d..9cbc2491a79 100644
--- a/x11/kde/base/pkg/PLIST
+++ b/x11/kde/base/pkg/PLIST
@@ -48,12 +48,10 @@ bin/klissie.kss
 bin/klock
 bin/kmatrix.kss
 bin/kmenuedit
-bin/kmorph3d.kss
 bin/konsole
 bin/konsole_grantpty
 bin/kpager
 bin/kpanel
-bin/kpipes.kss
 bin/kplayaudio
 bin/kpolygon.kss
 bin/kpyro.kss
@@ -63,7 +61,6 @@ bin/krootwm
 bin/kscience.kss
 bin/kslidescreen.kss
 bin/kslip.kss
-bin/kspace.kss
 bin/kstart
 bin/kswarm.kss
 bin/kthememgr
@@ -2452,9 +2449,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
-@dirrm share/icons/mini
-@dirrm share/icons/large
-@dirrm share/icons
 @dirrm share/doc/HTML/ru/kikbd
 @dirrm share/doc/HTML/ru
 @dirrm share/doc/HTML/en/kwm
@@ -2489,6 +2483,7 @@ share/wallpapers/wood1.jpg
 @dirrm share/doc/HTML/en/kcontrol/kcmdisplay
 @dirrm share/doc/HTML/en/kcontrol/kcmbell
 @dirrm share/doc/HTML/en/kcontrol
+@dirrm share/doc/HTML/en/
 @dirrm share/apps/kwm/pics
 @dirrm share/apps/kwm
 @dirrm share/apps/kthememgr/Themes
diff --git a/x11/kde/libs/Makefile b/x11/kde/libs/Makefile
index 962ddd6b978..31c318577fc 100644
--- a/x11/kde/libs/Makefile
+++ b/x11/kde/libs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/03/24 23:28:40 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2000/03/25 14:00:04 kevlo Exp $
 # Original Author: Yanick Cote <yanick@fries.net>
 
 DISTNAME=	kdelibs-1.1.2
@@ -15,11 +15,18 @@ LIB_DEPENDS=	qt.1.45::x11/qt \
 		png.1.3::graphics/png \
 		tiff.35::graphics/tiff
 
+PERMIT_PACKAGE_CDROM=   Yes
+PERMIT_PACKAGE_FTP=     Yes
+PERMIT_DISTFILES_CDROM= Yes
+PERMIT_DISTFILES_FTP=   Yes
+
 USE_BZIP2=	Yes
 USE_GMAKE=	Yes
 GNU_CONFIGURE=	Yes
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --enable-static
+CONFIGURE_ARGS+= --enable-static \
+                 --with-qt-includes=${LOCALBASE}/include/X11/qt \
+                 --with-qt-libraries=${LOCALBASE}/lib
 
 pre-build:      
 	@echo ""
diff --git a/x11/kde/libs/pkg/PLIST b/x11/kde/libs/pkg/PLIST
index 0aa6178d6af..74b624e6d7d 100644
--- a/x11/kde/libs/pkg/PLIST
+++ b/x11/kde/libs/pkg/PLIST
@@ -316,7 +316,6 @@ share/toolbar/viewzoom.xpm
 @dirrm share/doc/HTML/en/kspell
 @dirrm share/doc/HTML/en/kfiledialog
 @dirrm share/doc/HTML/en/kdelibs
-@dirrm share/doc/HTML/en
 @dirrm share/apps/khtmlw/pics
 @dirrm share/apps/khtmlw
 @dirrm share/apps/kde/pics