diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index c2048e365275..909271671b8b 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	${KDE_VERSION}
+PORTVERSION=	${KDE_VERSION}a
 CATEGORIES?=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER?=	kde@FreeBSD.org
 
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index e501a3a7a209..5c850676d8e0 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.0.3.tar.bz2) = f26acfafbd3a00451b6e344a7d75386d
+MD5 (KDE/kdelibs-3.0.3a.tar.bz2) = 02627f595af113f7d544561a7ff6ec85
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index 15a286e565e7..69225d77652e 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -3187,16 +3187,10 @@ share/servicetypes/ktexteditoreditor.desktop
 share/servicetypes/kurifilterplugin.desktop
 share/servicetypes/renamedlgplugin.desktop
 share/servicetypes/scriptinterface.desktop
-@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
+@comment empty directories
 @exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
 @exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
+@comment remove directories
 @dirrm share/servicetypes
 @dirrm share/services/kded
 @dirrm share/services
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index c2048e365275..909271671b8b 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	${KDE_VERSION}
+PORTVERSION=	${KDE_VERSION}a
 CATEGORIES?=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER?=	kde@FreeBSD.org
 
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index e501a3a7a209..5c850676d8e0 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.0.3.tar.bz2) = f26acfafbd3a00451b6e344a7d75386d
+MD5 (KDE/kdelibs-3.0.3a.tar.bz2) = 02627f595af113f7d544561a7ff6ec85
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 15a286e565e7..69225d77652e 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -3187,16 +3187,10 @@ share/servicetypes/ktexteditoreditor.desktop
 share/servicetypes/kurifilterplugin.desktop
 share/servicetypes/renamedlgplugin.desktop
 share/servicetypes/scriptinterface.desktop
-@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
+@comment empty directories
 @exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
 @exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
+@comment remove directories
 @dirrm share/servicetypes
 @dirrm share/services/kded
 @dirrm share/services