diff --git a/features/org.jkiss.dbeaver.core.feature/feature.xml b/features/org.jkiss.dbeaver.core.feature/feature.xml
index a3ad5fdeeb3c279635d68aefb8157ebac70ed295..1578eb73f3de2b87097fe21e75d76f0935875337 100644
--- a/features/org.jkiss.dbeaver.core.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.core.feature/feature.xml
@@ -45,7 +45,6 @@
     <plugin id="org.jkiss.dbeaver.runtime.ide.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.debug" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.erd" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.import_config" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.ui.locks" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
diff --git a/features/org.jkiss.dbeaver.debug.feature/feature.xml b/features/org.jkiss.dbeaver.debug.feature/feature.xml
index c9da9672e5f4be5e6433f3fd653f51a0afee2a26..fe2012cd197d1e1c33b0c1d398e0a84dc259c39c 100644
--- a/features/org.jkiss.dbeaver.debug.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.debug.feature/feature.xml
@@ -1,25 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-        id="org.jkiss.dbeaver.debug.feature"
-        label="%featureName"
-        version="1.0.0"
-        provider-name="%providerName">
-
-    <description>
-        %description
-    </description>
-
-    <copyright>
-        %copyright
-    </copyright>
-
-    <license url="%licenseURL">
-        %license
-    </license>
-
-    <plugin id="org.jkiss.dbeaver.debug.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.debug.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.postgresql.debug.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.postgresql.debug.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+      id="org.jkiss.dbeaver.debug.feature"
+      label="%featureName"
+      version="1.0.0"
+      provider-name="%providerName">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.debug.ui"/>
+   </requires>
+
+   <plugin
+         id="org.jkiss.dbeaver.debug.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.jkiss.dbeaver.debug.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.jkiss.dbeaver.ext.postgresql.debug.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.jkiss.dbeaver.ext.postgresql.debug.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/features/org.jkiss.dbeaver.standalone.feature/feature.xml b/features/org.jkiss.dbeaver.standalone.feature/feature.xml
index e6c69bdb0a25bf5543c18278a9602a72927fb6f1..17a2e8857a8e0592852ce0fa5abec5f28a645774 100644
--- a/features/org.jkiss.dbeaver.standalone.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.standalone.feature/feature.xml
@@ -24,6 +24,7 @@
 
     <includes id="org.jkiss.dbeaver.rcp.feature" version="0.0.0"/>
     <includes id="org.jkiss.dbeaver.core.feature" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.debug.feature" version="0.0.0"/>
     <includes id="org.jkiss.dbeaver.ext.generic.feature" version="0.0.0"/>
     <includes id="org.jkiss.dbeaver.ext.mysql.feature" version="0.0.0"/>
     <includes id="org.jkiss.dbeaver.ext.oracle.feature" version="0.0.0"/>