diff --git a/debug/org.eclipse.cdt.debug.dap-feature/.project b/debug/org.eclipse.cdt.debug.dap-feature/.project
new file mode 100644
index 00000000000..beec95bf7c2
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.dap-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.cdt.debug.dap-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/debug/org.eclipse.cdt.debug.dap-feature/build.properties b/debug/org.eclipse.cdt.debug.dap-feature/build.properties
new file mode 100644
index 00000000000..274b1f45828
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.dap-feature/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+#  Copyright (c) 2019 Kichwa Coders Canada and others.
+#
+#  This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License 2.0
+#  which accompanies this distribution, and is available at
+#  https://www.eclipse.org/legal/epl-2.0/
+#
+#  SPDX-License-Identifier: EPL-2.0
+#
+#  Contributors:
+#      Jonah Graham (Kichwa) - initial API and implementation
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/debug/org.eclipse.cdt.debug.dap-feature/feature.properties b/debug/org.eclipse.cdt.debug.dap-feature/feature.properties
new file mode 100644
index 00000000000..b63d0ead8c9
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.dap-feature/feature.properties
@@ -0,0 +1,24 @@
+###############################################################################
+# Copyright (c) 2019 Kichwa Coders Canada and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     Jonah Graham (Kichwa) - initial API and implementation
+###############################################################################
+
+featureName=C/C++ Debug Adapter GDB Debugger Integration
+providerName=Eclipse CDT
+description=Debug Adapter (DAP) integration with gdb debugger
+copyright=\
+Copyright (c) 2019 Kichwa Coders Canada and others.\n\
+This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
diff --git a/debug/org.eclipse.cdt.debug.dap-feature/feature.xml b/debug/org.eclipse.cdt.debug.dap-feature/feature.xml
new file mode 100644
index 00000000000..4aa5fb543d8
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.dap-feature/feature.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.cdt.debug.dap"
+      label="%featureName"
+      version="9.9.0.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import plugin="org.apache.commons.io"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.ui.genericeditor" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.cdt.ui"/>
+      <import plugin="org.eclipse.cdt.core"/>
+      <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.commands"/>
+      <import plugin="org.eclipse.core.expressions"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="com.google.gson" version="2.8.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.lsp4j.jsonrpc"/>
+      <import plugin="org.eclipse.cdt.launch"/>
+      <import plugin="org.eclipse.lsp4e.debug"/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.cdt.debug.core"/>
+      <import plugin="org.eclipse.lsp4j.debug"/>
+      <import plugin="org.eclipse.lsp4j.jsonrpc.debug"/>
+      <import plugin="com.google.guava"/>
+      <import plugin="org.eclipse.xtext.xbase.lib"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.lsp4e" version="0.11.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.lsp4j" version="0.7.2" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.cdt.debug.dap"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/pom.xml b/pom.xml
index 2f5bc03d40b..7e9267f9595 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,7 @@
 		<module>debug/org.eclipse.cdt.debug.ui</module>
 
 		<module>debug/org.eclipse.cdt.debug.dap</module>
+		<module>debug/org.eclipse.cdt.debug.dap-feature</module>
 
 		<module>debug/org.eclipse.cdt.gdb</module>
 		<module>debug/org.eclipse.cdt.gdb.ui</module>
diff --git a/releng/org.eclipse.cdt.repo/category.xml b/releng/org.eclipse.cdt.repo/category.xml
index 13b81c20049..f0f7e59e7b9 100644
--- a/releng/org.eclipse.cdt.repo/category.xml
+++ b/releng/org.eclipse.cdt.repo/category.xml
@@ -125,6 +125,12 @@
      <feature url="features/org.eclipse.cdt.qt.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.qt.source" version="0.0.0">
       <category name="extra"/>
    </feature>
+   <feature url="features/org.eclipse.cdt.debug.dap_0.0.0.qualifier.jar" id="org.eclipse.cdt.debug.dap" version="0.0.0">
+      <category name="extra"/>
+   </feature>
+   <feature url="features/org.eclipse.cdt.debug.dap.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.debug.dap.source" version="0.0.0">
+      <category name="extra"/>
+   </feature>
    <feature url="features/org.eclipse.cdt.debug.standalone_0.0.0.qualifier.jar" id="org.eclipse.cdt.debug.standalone" version="0.0.0">
       <category name="extra"/>
    </feature>