diff --git a/services/kernel-switcher b/services/kernel-switcher
index 1a9be232b..9b252f31e 100755
--- a/services/kernel-switcher
+++ b/services/kernel-switcher
@@ -8,6 +8,7 @@ sys.path.insert(0, '../server')
 sys.path.insert(0, '../client')
 
 import os
+import subprocess
 
 from entropy.const import etpUi, etpConst
 from entropy.output import teal, purple, darkgreen, blue, brown, print_info, \
@@ -53,6 +54,11 @@ def _get_target_tag(etp_client, kernel_match):
         tags = sorted(tags, reverse = True)
         return tags.pop(0)
 
+def _setup_kernel_symlink(target_tag):
+    eselect_exec = "/usr/bin/eselect"
+    if os.access(eselect_exec, os.X_OK) and not etpUi['pretend']:
+        subprocess.call((eselect_exec, "kernel", "set", target_tag))
+
 def _switch_kernel(args):
     if not args:
         print_error(brown(_("No kernel packages given")))
@@ -116,6 +122,8 @@ def _switch_kernel(args):
             atomsdata = matches,
             check_critical_updates = False
         )
+        if rc == 0:
+            _setup_kernel_symlink(target_tag)
         return rc
 
     finally: