diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 0a709d6d9fc..3f4a790d168 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/06/20 16:20:16 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2010/06/20 21:09:52 espie Exp $
 
      SUBDIR =
 # don't even try to keep these sorted
@@ -20,19 +20,19 @@
      SUBDIR += base-workspace
 
 # actual apps
-     SUBDIR += accessibility
-     SUBDIR += admin
+#     SUBDIR += accessibility
+#     SUBDIR += admin
      SUBDIR += artwork
      SUBDIR += edu
      SUBDIR += games
      SUBDIR += graphics
-     SUBDIR += multimedia
+#     SUBDIR += multimedia
      SUBDIR += network
-#     SUBDIR += pim
-     SUBDIR += sdk
-     SUBDIR += toys
-     SUBDIR += utils
-     SUBDIR += webdev
-     SUBDIR += extragear-plasma
+     SUBDIR += pim
+#     SUBDIR += sdk
+#     SUBDIR += toys
+#     SUBDIR += utils
+#     SUBDIR += webdev
+#     SUBDIR += extragear-plasma
 
 .include <bsd.port.subdir.mk>
diff --git a/x11/kde4/Makefile.inc b/x11/kde4/Makefile.inc
index ee0c5fddacd..16bed3ed347 100644
--- a/x11/kde4/Makefile.inc
+++ b/x11/kde4/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.10 2010/06/18 09:32:15 espie Exp $
+# $OpenBSD: Makefile.inc,v 1.11 2010/06/20 21:09:52 espie Exp $
 
 FLAVOR ?=
 FLAVORS ?=		debug
@@ -11,7 +11,7 @@ MODULES +=		x11/qt4
 MODQT_MT ?=		Yes
 MODQT_OVERRIDE_UIC ?=	No
 SHARED_ONLY ?=		Yes
-ONLY_FOR_ARCHES ?=	${GCC4_ARCHES}
+ONLY_FOR_ARCHS ?=	${GCC4_ARCHS}
 
 MODULES +=		devel/cmake
 CONFIGURE_STYLE ?=	cmake
@@ -28,7 +28,6 @@ PERMIT_PACKAGE_CDROM ?=		Yes
 PERMIT_PACKAGE_FTP ?=		Yes
 CONFIGURE_ENV +=		QTDIR=${MODQT_LIBDIR} HOME=${WRKDIR}
 SEPARATE_BUILD =		simple
-MAKE_FLAGS =	VERBOSE=2
 
 #CONFIGURE_ARGS +=	--debug-output --debug-trycompile
 .if ${FLAVOR:L:Mdebug}
diff --git a/x11/kde4/accessibility/Makefile b/x11/kde4/accessibility/Makefile
index a90e9f6ff8c..a7f023f9f12 100644
--- a/x11/kde4/accessibility/Makefile
+++ b/x11/kde4/accessibility/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2010/04/15 14:34:12 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2010/06/20 21:09:52 espie Exp $
 
 COMMENT =		K Desktop Environment, accessibility
 DISTNAME =		kdeaccessibility-${VERSION}
-PKGNAME =		${DISTNAME}p0
+PKGNAME =		${DISTNAME}
 
 SHARED_LIBS +=  kttsd             3.0 # .4.0
 
diff --git a/x11/kde4/accessibility/distinfo b/x11/kde4/accessibility/distinfo
index 6a497ca0b1e..fb5ae618f04 100644
--- a/x11/kde4/accessibility/distinfo
+++ b/x11/kde4/accessibility/distinfo
@@ -1,5 +1,5 @@
-MD5 (kde/kdeaccessibility-4.0.1.tar.bz2) = 8XoBgX804Ui/kcNucssjzw==
-RMD160 (kde/kdeaccessibility-4.0.1.tar.bz2) = 3XWxEkQFINkZfS5mrm+sh5Rqv1c=
-SHA1 (kde/kdeaccessibility-4.0.1.tar.bz2) = u+ZGaej0EG4shTMDKnLfJHAM9qo=
-SHA256 (kde/kdeaccessibility-4.0.1.tar.bz2) = BKbRc8sqbwTMuPvweMJ4LuFzFZ+FgRI/gcrq2NrCRek=
-SIZE (kde/kdeaccessibility-4.0.1.tar.bz2) = 6368878
+MD5 (kde/kdeaccessibility-4.4.4.tar.bz2) = vbBELtB2Kx3TzegjNSJSUQ==
+RMD160 (kde/kdeaccessibility-4.4.4.tar.bz2) = eEjpvacBtyGRtTbfEST+kEUtXtE=
+SHA1 (kde/kdeaccessibility-4.4.4.tar.bz2) = QaBzAbhsN6OWiRMrFmLFF1HuSDM=
+SHA256 (kde/kdeaccessibility-4.4.4.tar.bz2) = YMDX+zN/d/HQLQdEU1xOVpJf0qU7zPu7t06Qy09dbmw=
+SIZE (kde/kdeaccessibility-4.4.4.tar.bz2) = 5586181
diff --git a/x11/kde4/admin/distinfo b/x11/kde4/admin/distinfo
index d61aa23184e..204ace7f3fa 100644
--- a/x11/kde4/admin/distinfo
+++ b/x11/kde4/admin/distinfo
@@ -1,5 +1,5 @@
-MD5 (kde/kdeadmin-4.0.1.tar.bz2) = YV2FV3uEozBO8SWCrxm3MA==
-RMD160 (kde/kdeadmin-4.0.1.tar.bz2) = Qc4bH8+xZ1jOOWLdsuCyWxJb+ow=
-SHA1 (kde/kdeadmin-4.0.1.tar.bz2) = cLcgEhmLQM8tDGmZns6D4ywMy7Q=
-SHA256 (kde/kdeadmin-4.0.1.tar.bz2) = T2R+currmLCL15JTK+VX5j39iiSQVUDj7goHsxxXj58=
-SIZE (kde/kdeadmin-4.0.1.tar.bz2) = 1305719
+MD5 (kde/kdeadmin-4.4.4.tar.bz2) = JqEDMCbjALcLKXr2H14eHA==
+RMD160 (kde/kdeadmin-4.4.4.tar.bz2) = JdcQciJFRsAMRh7AGBWRDVX82u8=
+SHA1 (kde/kdeadmin-4.4.4.tar.bz2) = Gkc/7LOl/plqFWdGNiIDdTiodtQ=
+SHA256 (kde/kdeadmin-4.4.4.tar.bz2) = 8Jv8tE1qY/NZRKUqlHTsDmS4yGpC2/c3ZJ93tLndXhI=
+SIZE (kde/kdeadmin-4.4.4.tar.bz2) = 1430798
diff --git a/x11/kde4/libs/patches/patch-kjs_CMakeLists_txt b/x11/kde4/libs/patches/patch-kjs_CMakeLists_txt
new file mode 100644
index 00000000000..72748b3cec6
--- /dev/null
+++ b/x11/kde4/libs/patches/patch-kjs_CMakeLists_txt
@@ -0,0 +1,12 @@
+$OpenBSD: patch-kjs_CMakeLists_txt,v 1.1 2010/06/20 21:09:52 espie Exp $
+--- kjs/CMakeLists.txt.orig	Sat May 29 15:03:46 2010
++++ kjs/CMakeLists.txt	Sat May 29 15:06:48 2010
+@@ -223,7 +223,7 @@ kde4_add_executable(kjs_bin NOGUI ${kjs_SRCS})
+ 
+ set_target_properties(kjs_bin PROPERTIES OUTPUT_NAME ${kjs_bin_OUTPUT_NAME})
+ 
+-target_link_libraries(kjs_bin ${KJSLIBNAME})
++target_link_libraries(kjs_bin ${KJSLIBNAME} ${CMAKE_THREAD_LIBS_INIT})
+ 
+ install(TARGETS kjs_bin ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
diff --git a/x11/kde4/multimedia/distinfo b/x11/kde4/multimedia/distinfo
index e1de85d617c..cfe768e26a1 100644
--- a/x11/kde4/multimedia/distinfo
+++ b/x11/kde4/multimedia/distinfo
@@ -1,5 +1,5 @@
-MD5 (kde/kdemultimedia-4.0.1.tar.bz2) = mpcUB/EF/Wq1SgRGeUDIpw==
-RMD160 (kde/kdemultimedia-4.0.1.tar.bz2) = UyWXNfXpfF4th7JGgORtSe/f14M=
-SHA1 (kde/kdemultimedia-4.0.1.tar.bz2) = RDOSiRxBEU9D00YGHDDuG1En+ZM=
-SHA256 (kde/kdemultimedia-4.0.1.tar.bz2) = wP14RrMH/p1037zf1oSNu2pvt4PWA3IguAbeuolGV1o=
-SIZE (kde/kdemultimedia-4.0.1.tar.bz2) = 1048728
+MD5 (kde/kdemultimedia-4.4.4.tar.bz2) = LnJ1t2kJBGHHLOTFWDN0vg==
+RMD160 (kde/kdemultimedia-4.4.4.tar.bz2) = /MlZVOq2jte51acCNaeKOzhDgIM=
+SHA1 (kde/kdemultimedia-4.4.4.tar.bz2) = C3qiEFmVzqnBInPNUwFvGr1bFxQ=
+SHA256 (kde/kdemultimedia-4.4.4.tar.bz2) = jA3tVV2vf7STmj19BIrFwFQkRsPcyqdFT9/cz1mxcbM=
+SIZE (kde/kdemultimedia-4.4.4.tar.bz2) = 1454079
diff --git a/x11/kde4/network/distinfo b/x11/kde4/network/distinfo
index b317769e4f6..6cfbf9a18b5 100644
--- a/x11/kde4/network/distinfo
+++ b/x11/kde4/network/distinfo
@@ -1,5 +1,5 @@
-MD5 (kde/kdenetwork-4.0.1.tar.bz2) = MTczmQVP0zFsODDWBuos3A==
-RMD160 (kde/kdenetwork-4.0.1.tar.bz2) = /NMgqF00e0mR7drMZGpoHWb3osA=
-SHA1 (kde/kdenetwork-4.0.1.tar.bz2) = 5/oVEnlGfEH5z30anXzgKnbfpcQ=
-SHA256 (kde/kdenetwork-4.0.1.tar.bz2) = wWbRaUMFfdQ52bJoRf13lMAgSN9o77acQDOrKWHPdXo=
-SIZE (kde/kdenetwork-4.0.1.tar.bz2) = 6365173
+MD5 (kde/kdenetwork-4.4.4.tar.bz2) = QmGdxlz4uKbkg9/yOkpRJw==
+RMD160 (kde/kdenetwork-4.4.4.tar.bz2) = rUqO+bprrx48Fh89+crjFOM4HwA=
+SHA1 (kde/kdenetwork-4.4.4.tar.bz2) = FwawCdcjiXy8mtmwwXQ4c+jnk2I=
+SHA256 (kde/kdenetwork-4.4.4.tar.bz2) = +vrfq1Wv/Lg3VX8JqlBKFzUO6watehcnU3FUnkp+WI0=
+SIZE (kde/kdenetwork-4.4.4.tar.bz2) = 8321292
diff --git a/x11/kde4/sdk/distinfo b/x11/kde4/sdk/distinfo
index b3dfdf352e3..32c5ffac2cc 100644
--- a/x11/kde4/sdk/distinfo
+++ b/x11/kde4/sdk/distinfo
@@ -1,5 +1,5 @@
-MD5 (kde/kdesdk-4.0.1.tar.bz2) = GyVnAcGjoJoVfui+O2cXjg==
-RMD160 (kde/kdesdk-4.0.1.tar.bz2) = 21pzCiXQrUbGljvoPtaMtQQAwpE=
-SHA1 (kde/kdesdk-4.0.1.tar.bz2) = w9iK23HNvpUgHNNTU8GCWjNv2EQ=
-SHA256 (kde/kdesdk-4.0.1.tar.bz2) = jBwzsucTZBpyA+1BpBXLhhNPooJMDdhy84qLafeNtjQ=
-SIZE (kde/kdesdk-4.0.1.tar.bz2) = 4221921
+MD5 (kde/kdesdk-4.4.4.tar.bz2) = /s9r0d0WZBR1Q/1lzaUy5g==
+RMD160 (kde/kdesdk-4.4.4.tar.bz2) = y3z/LAV+G2+7H9Hu2L5TbW0jQLE=
+SHA1 (kde/kdesdk-4.4.4.tar.bz2) = 9ipU99HmsmD1SMkDHF3cr6wMnq8=
+SHA256 (kde/kdesdk-4.4.4.tar.bz2) = IzsOkIrckKs74/1f3Tvrw/CgRc8KP81R8bG8WSP3zKI=
+SIZE (kde/kdesdk-4.4.4.tar.bz2) = 5649432
diff --git a/x11/kde4/toys/distinfo b/x11/kde4/toys/distinfo
index 548b15092b4..fe2f27e1a22 100644
--- a/x11/kde4/toys/distinfo
+++ b/x11/kde4/toys/distinfo
@@ -1,5 +1,5 @@
-MD5 (kde/kdetoys-4.0.1.tar.bz2) = Nb/ucv9VOgBeo7EynsD1uA==
-RMD160 (kde/kdetoys-4.0.1.tar.bz2) = i8m8IM8WuuD/J03YFQ/d13P+6hI=
-SHA1 (kde/kdetoys-4.0.1.tar.bz2) = QjxaL2yr/tUFMtj0l/JWH0vSsYw=
-SHA256 (kde/kdetoys-4.0.1.tar.bz2) = kWgGMaA722vYrxSIIroz9PJNxd9Bg/OOe02lw+ySdUs=
-SIZE (kde/kdetoys-4.0.1.tar.bz2) = 2238961
+MD5 (kde/kdetoys-4.4.4.tar.bz2) = CMQSfNuPCIiHZJieYn0hCw==
+RMD160 (kde/kdetoys-4.4.4.tar.bz2) = nDiDGPHlks9Uvlqkwcn2PGBmZRI=
+SHA1 (kde/kdetoys-4.4.4.tar.bz2) = rAoMg6HUlg8azeUyc0x+HuvEnqc=
+SHA256 (kde/kdetoys-4.4.4.tar.bz2) = SDWIKGvj//UuH2ryEbVxeVQRfhYn8AmSM3bIQbd3BZs=
+SIZE (kde/kdetoys-4.4.4.tar.bz2) = 1331786
diff --git a/x11/kde4/utils/distinfo b/x11/kde4/utils/distinfo
index 565adb0a0e9..5e8854338e6 100644
--- a/x11/kde4/utils/distinfo
+++ b/x11/kde4/utils/distinfo
@@ -1,5 +1,5 @@
-MD5 (kde/kdeutils-4.0.1.tar.bz2) = lukQFjratBvMD/mvk4MAhQ==
-RMD160 (kde/kdeutils-4.0.1.tar.bz2) = C3NeXDdsqfiyDmGj6lb5+umEVnc=
-SHA1 (kde/kdeutils-4.0.1.tar.bz2) = lthphNvKGGcO99SWInwblpBuoJw=
-SHA256 (kde/kdeutils-4.0.1.tar.bz2) = nlkLXRII6mgX6r0MZjWRNy18yV6FzID+WHjL2+Vn5v4=
-SIZE (kde/kdeutils-4.0.1.tar.bz2) = 2354537
+MD5 (kde/kdeutils-4.4.4.tar.bz2) = 8JMx86Oxr89IlybMnzGhhg==
+RMD160 (kde/kdeutils-4.4.4.tar.bz2) = D5yViY67bYHo8Igh8//sY9d2OOs=
+SHA1 (kde/kdeutils-4.4.4.tar.bz2) = mo4zWIYhUUF/TRChwZg5RCsHflI=
+SHA256 (kde/kdeutils-4.4.4.tar.bz2) = rCAcPzvWvNoMSwJ7prpuhQr3pXe3vk5QfmZWDsxQt+0=
+SIZE (kde/kdeutils-4.4.4.tar.bz2) = 2693100
diff --git a/x11/kde4/webdev/distinfo b/x11/kde4/webdev/distinfo
index dfd7bb712d9..7cf2e723183 100644
--- a/x11/kde4/webdev/distinfo
+++ b/x11/kde4/webdev/distinfo
@@ -1,5 +1,5 @@
-MD5 (kde/kdewebdev-4.0.1.tar.bz2) = Bs/lxqC2DDBfs3bRTAwvMQ==
-RMD160 (kde/kdewebdev-4.0.1.tar.bz2) = Fo+YyoqJBUdyFfsbe+9zGEyr5ic=
-SHA1 (kde/kdewebdev-4.0.1.tar.bz2) = 1uc334QWxBxo4SPvB+XseFkoydQ=
-SHA256 (kde/kdewebdev-4.0.1.tar.bz2) = gvWoIGYtZwL/f5996wqr26wgFLgrt0M5IDYr0NqI9bc=
-SIZE (kde/kdewebdev-4.0.1.tar.bz2) = 1168599
+MD5 (kde/kdewebdev-4.4.4.tar.bz2) = 8+lYJ4q43S3vzgKbX2Hahw==
+RMD160 (kde/kdewebdev-4.4.4.tar.bz2) = gtD5iJK2fXqT0RXDD6C1L+U/2xg=
+SHA1 (kde/kdewebdev-4.4.4.tar.bz2) = tyIB8D/7GQP4LVubPtbHTM0IGpM=
+SHA256 (kde/kdewebdev-4.4.4.tar.bz2) = 8RszMDWtr79lSsR66hK8mh57KCPp+liATnmivWcprMk=
+SIZE (kde/kdewebdev-4.4.4.tar.bz2) = 2175589