diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
index 67ab41d2e..86d30a567 100644
--- a/package/yast2-installation.changes
+++ b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May 30 14:35:05 UTC 2016 - lslezak@suse.cz
+
+- Move the debugger invocation code to yast2-ruby-bindings package
+  to use the same implementation at run time (FATE#318421)
+- 3.1.190
+
 -------------------------------------------------------------------
 Thu May 26 13:17:42 UTC 2016 - kanderssen@suse.com
 
diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
index 25689fb5e..047ceb7bb 100644
--- a/package/yast2-installation.spec
+++ b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.189
+Version:        3.1.190
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -26,8 +26,7 @@ Source0:        %{name}-%{version}.tar.bz2
 Group:          System/YaST
 License:        GPL-2.0
 Url:            http://github.com/yast/yast-installation
-# yast/debugger
-Requires:       yast2-ruby-bindings >= 3.1.47
+Requires:       yast2-ruby-bindings >= 3.1.8
 
 Summary:        YaST2 - Installation Parts
 
diff --git a/src/lib/installation/clients/installation.rb b/src/lib/installation/clients/installation.rb
index 706d0fc7e..20003a3ad 100644
--- a/src/lib/installation/clients/installation.rb
+++ b/src/lib/installation/clients/installation.rb
@@ -47,9 +47,6 @@ def main
       UI.SetProductLogo(true)
       Wizard.OpenLeftTitleNextBackDialog
 
-      # start the debugger if requested (FATE#318421)
-      start_debugger
-
       Wizard.SetContents(
         # title
         "",
@@ -104,22 +101,5 @@ def main
 
       deep_copy(@ret)
     end
-
-  private
-
-    # start the Ruby debugger if booted with the Y2DEBUGGER option
-    def start_debugger
-      return unless (Linuxrc.InstallInf("Cmdline") || "").match(/\bY2DEBUGGER=(.*)\b/i)
-
-      option = Regexp.last_match[1]
-      log.info "Y2DEBUGGER option: #{option}"
-
-      if option == "1" || option == "remote" || option == "manual"
-        require "yast/debugger"
-        Debugger.start(remote: option == "remote", start_client: option != "manual")
-      else
-        log.warn "Unknown Y2DEBUGGER value: #{option}"
-      end
-    end
   end
 end