diff --git a/config/functions b/config/functions
index 81cdf5956d..670185beed 100644
--- a/config/functions
+++ b/config/functions
@@ -270,6 +270,11 @@ enable_service () {
       fi
     done
   fi
+  for target in `grep '^Alias' $target_dir/$unit_dir/$unit | cut -f2 -d=` ; do
+    if [ -n "$target" ]; then
+      ln -sf ${unit} ${target_dir}/$unit_dir/${target}
+    fi
+  done
 }
 
 check_path() {
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 27d3f39592..eb855ed02e 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -346,10 +346,7 @@ post_makeinstall_target() {
 }
 
 post_install() {
-  # link default.target to kodi.target
-  ln -sf kodi.target $INSTALL/usr/lib/systemd/system/default.target
-
-  # enable default services
+  enable_service kodi.target
   enable_service kodi-autostart.service
   enable_service kodi-cleanlogs.service
   enable_service kodi-halt.service