diff --git a/bin/kde5-migrate-user-conf b/bin/kde5-migrate-user-conf
index 3f1533f..0d12341 100755
--- a/bin/kde5-migrate-user-conf
+++ b/bin/kde5-migrate-user-conf
@@ -2,8 +2,8 @@
 # openmamba simple kde4->kde5 user config migration script
 if [ "$1" = "-f" ]; then
    FORCE=1
-else
-   [ -e ~/.kde4/share/config/ -a ! -e ~/.kde4/share/.kde5_conf_migrated ] || exit 0
+#else
+#   [ -e ~/.kde4/share/config/ -a ! -e ~/.kde4/share/.kde5_conf_migrated ] || exit 0
 fi
 for p in ~/.kde4/share/config/*; do
    [ -L $p ] && continue
@@ -23,6 +23,24 @@ for p in ~/.kde4/share/config/*; do
    fi
 done
 
+for p in ~/.config/akonadi/*; do
+   [ -L $p ] && continue
+   f=`basename $p`
+   if [ -e ~/.config/$f ]; then
+      if [ "$FORCE" ]; then
+         echo "Migrating $p -> ~/.config/$f [forced]"
+         mv ~/.config/$f ~/.config/$f.bak
+         mv $p ~/.config/ || exit 1
+         ln -s ../$f $p || exit 1
+      fi
+      #echo "SKIPPED: $p"
+   else
+      echo "Migrating $p -> ~/.config/$f"
+      mv $p ~/.config/ || exit 1
+      ln -s ../$f $p || exit 1
+   fi
+done
+
 for p in ~/.kde4/share/apps/*; do
    [ -L $p ] && continue
    f=`basename $p`