diff --git a/client/tasks/kde.yml b/client/tasks/kde.yml
index 371bfc2769ad79d27f647afbba64cb713ccdaf56..5882cdff343d5e75d3d7b301dbe52ff75aeb2d48 100644
--- a/client/tasks/kde.yml
+++ b/client/tasks/kde.yml
@@ -4,9 +4,11 @@
   apt:
     name:
       - dolphin
-      - kde-baseapps-bin
+      - kdialog
+      - keditbookmarks
+      - kfind
       - konsole
-      - kdepasswd
+      - kwrite
     state: present
   tags:
     - packages
@@ -22,6 +24,7 @@
       - kde-runtime
       - udisks2
       - upower
+      - kwin-x11
       - sddm
       - sddm-theme-breeze
       - xserver-xorg
@@ -35,12 +38,18 @@
 - name: ensure reasonable subset of kde-standard is installed
   apt:
     name:
+      - akregator
       - ark
       - gwenview
+      - kaddressbook
       - kate
       - kcalc
       - kde-spectacle
       - khelpcenter
+      - kmail
+      - knotes
+      - kopete
+      - korganizer
       - kwalletmanager
       - okular
       - plasma-dataengines-addons
@@ -69,6 +78,7 @@
       - ktimer
       - kwalletmanager
       - sweeper
+      - print-manager
     state: present
   tags:
     - packages
@@ -76,13 +86,41 @@
     - desktop
     - kdeutils
 
+- name: ensure reasonable subset of kdesdk is installed
+  apt:
+    name:
+      - dolphin-plugins
+      - kapptemplate
+      - kate
+      - kcachegrind
+      - kdesdk-scripts
+      - kdesdk-thumbnailers
+      - kompare
+      - kpartloader
+      - kuiviewer
+      - lokalize
+      - okteta
+      - poxml
+      - umbrello
+    state: present
+  tags:
+    - packages
+    - kde
+    - desktop
+    - kdesdk
+
 - name: ensure reasonable subset of kde-full is installed
   apt:
     name:
-      - kdeartwork
+      - kdeaccessibility
       - kdeadmin
+      - kdeedu
       - kdegames
       - kdegraphics
+      - kdenetwork
+      - kdepim
+      - kdetoys
+      - kdewebdev
     state: present
   tags:
     - packages
@@ -93,6 +131,9 @@
 - name: ensure some further kde packages are installed
   apt:
     name:
+      - plasma-workspace-wallpapers
+      - kde-config-systemd
+      - kwave
       - gtk2-engines-oxygen
       - gtk3-engines-breeze
       - kde-config-gtk-style
diff --git a/client/tasks/software.yml b/client/tasks/software.yml
index 284c4e585d2609784bd67c074c5cea6a4589c2af..af1a6f453eb7a3c4b08d8578c8c4046097b7b496 100644
--- a/client/tasks/software.yml
+++ b/client/tasks/software.yml
@@ -30,7 +30,6 @@
       - evince
       - gv
       - pdfgrep
-      - pdfjam
       - pdfmod
       - pdftk
       - xournal
@@ -106,7 +105,7 @@
       - subversion
       - git-svn
       - gitk
-      - mysql-client
+      - mariadb-client
       - gdb
     state: present
 
@@ -151,7 +150,6 @@
     name:
       - rdesktop
       - x2goclient
-      - freerdp-x11
       - x11vnc
       - filezilla