diff --git a/meta-phosphor/conf/distro/include/extra-dev-debug-tools.inc b/meta-phosphor/conf/distro/include/extra-dev-debug-tools.inc
new file mode 100644
index 0000000..66a156c
--- /dev/null
+++ b/meta-phosphor/conf/distro/include/extra-dev-debug-tools.inc
@@ -0,0 +1 @@
+DISTRO_FEATURES += "extra-dev-debug-tools"
diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index 07049a4..a1b4355 100644
--- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -71,6 +71,11 @@
         trace-enable \
         "
 
+EXTRA_DEV_DEBUG_TOOLS = "gdbserver strace opkg curl"
+RDEPENDS:${PN}-devtools:append = " \
+        ${@bb.utils.contains('DISTRO_FEATURES', 'extra-dev-debug-tools', '${EXTRA_DEV_DEBUG_TOOLS}', '', d)} \
+        "
+
 SUMMARY:${PN}-dbus-monitor = "Support for dbus monitoring"
 RDEPENDS:${PN}-dbus-monitor = " \
         phosphor-dbus-monitor \