diff --git a/kactivities/PKGBUILD b/kactivities/PKGBUILD
index 2f6973a8f..636ba2eb9 100644
--- a/kactivities/PKGBUILD
+++ b/kactivities/PKGBUILD
@@ -13,7 +13,7 @@ url='http://kde.org/'
 license=('GPL'
          'FDL')
 depends=("kdelibs>=${_kdever}"
-         "nepomuk-core>=${_kdever}"
+         "baloo-core>=${_kdever}"
          "soprano")
 makedepends=('cmake'
              'automoc4')
diff --git a/kdenetwork-kdnssd/PKGBUILD b/kdenetwork-kdnssd/PKGBUILD
deleted file mode 100644
index 99faf21a1..000000000
--- a/kdenetwork-kdnssd/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer:   H W Tovetjärn (totte) <totte@tott.es>
-# Contributors: Manuel Tortosa <manutortosa@chakra-project.org>
-
-# Include global configuration
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
-pkgname="kdenetwork-kdnssd"
-arch=('x86_64')
-pkgver=${_kdever}
-pkgrel=1
-pkgdesc='Monitors the network for DNS-SD services'
-depends=("kdelibs>=${_kdever}")
-conflicts=("kdenetwork-common" "kdenetwork-doc")
-groups=("kde" "kdenetwork" "kde-uninstall")
-categories=('network')
-url="http://www.kde.org"
-license=('GPL' 'LGPL' 'FDL')
-options=('docs' '!header' 'debug' 'log')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'docbook-xsl')
-source=("$_mirror/kdnssd-$_kdever.tar.xz")
-sha256sums=(`grep kdnssd-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`)
-
-build() {
-    cd ${srcdir}/kdnssd-$pkgver
-    cmake . \
-        -DCMAKE_BUILD_TYPE=${_build_type} \
-        -DCMAKE_INSTALL_PREFIX=${_installprefix} \
-        -DCMAKE_SKIP_RPATH=ON \
-        -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
-    make
-}
-
-package() {
-    cd ${srcdir}/kdnssd-$pkgver
-    make DESTDIR=${pkgdir} install
-}
diff --git a/kdenetwork-kdnssd/kdenetwork.install b/kdenetwork-kdnssd/kdenetwork.install
deleted file mode 100644
index 5879adadf..000000000
--- a/kdenetwork-kdnssd/kdenetwork.install
+++ /dev/null
@@ -1,88 +0,0 @@
-post_install() {
-		if [ -e "/etc/chakra/updates.conf" ] ; then
-
-			. /etc/chakra/updates.conf
-
-			if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
-				/usr/bin/chakra-update-icons
-			fi
-
-			if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then
-				/usr/bin/chakra-update-sycoca
-			fi	
-
-			if [ "$UPDATE_USER_CONFIG" = "yes" ]; then
-				/usr/bin/chakra-update-user-sycoca
-			fi
-		else
-			echo " > WARNING"
-			echo "   The package chakra-common seems not to be installed,"
-			echo "   this can possibly break the installation. Just install it"
-			echo "   manually after this installation/update, run the following"
-			echo "   commands and restart KDE afterwards:"
-			echo "   sudo chakra-config-updater"
-			echo "   kbuildsycoca4"
-			echo " "
-		fi
-}
-
-post_upgrade() {
-		if [ -e "/etc/chakra/updates.conf" ] ; then
-
-			. /etc/chakra/updates.conf
-
-			if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
-				/usr/bin/chakra-update-icons
-			fi
-
-			if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then
-				/usr/bin/chakra-update-sycoca
-			fi
-
-			if [ "$UPDATE_USER_CONFIG" = "yes" ]; then
-				/usr/bin/chakra-update-user-sycoca
-			fi
-		else
-			echo " > WARNING"
-			echo "   The package chakra-common seems not to be installed,"
-			echo "   this can possibly break the installation. Just install it"
-			echo "   manually after this installation/update, run the following"
-			echo "   commands and restart KDE afterwards:"
-			echo "   sudo chakra-config-updater"
-			echo "   kbuildsycoca4"
-			echo " "
-		fi
-}
-
-post_remove() {
-		if [ -e "/etc/chakra/updates.conf" ] ; then
-
-			. /etc/chakra/updates.conf
-
-			if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
-				/usr/bin/chakra-update-icons
-			fi
-
-			if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then
-				/usr/bin/chakra-update-sycoca
-			fi
-
-			if [ "$UPDATE_USER_CONFIG" = "yes" ]; then
-				/usr/bin/chakra-update-user-sycoca
-			fi
-		else
-			echo " > WARNING"
-			echo "   The package chakra-common seems not to be installed,"
-			echo "   this can possibly break the installation. Just install it"
-			echo "   manually after this installation/update, run the following"
-			echo "   commands and restart KDE afterwards:"
-			echo "   sudo chakra-config-updater"
-			echo "   kbuildsycoca4"
-			echo " "
-		fi
-}
-
-op=$1
-shift
-
-$op $*