Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 68192)
+++ /trunk/Config.kmk	(revision 68193)
@@ -440,8 +440,7 @@
  VBOX_WITH_AUDIO_PULSE = 1
 endif
-ifeq ($(KBUILD_TYPE),debug)
- ## @todo Only build if running on test boxes?
- VBOX_WITH_AUDIO_DEBUG =
-endif
+# Enable building debugging backend.
+# Only will be used at runtime when "VBoxInternal2/Audio/Debug/Enabled" (VM / global) is set.
+VBOX_WITH_AUDIO_DEBUG = 1
 # Enable PCI passthrough support.
 VBOX_WITH_PCI_PASSTHROUGH = 1
Index: /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp	(revision 68192)
+++ /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp	(revision 68193)
@@ -3000,16 +3000,25 @@
 
 #ifdef VBOX_WITH_AUDIO_DEBUG
-            /*
-             * The audio debug backend. Only can be used in debug builds.
-             */
-            CFGMR3InsertNodeF(pInst, &pLunL1, "LUN#%RU8", u8AudioLUN++);
-            InsertConfigString(pLunL1, "Driver", "AUDIO");
-
-            InsertConfigNode(pLunL1, "AttachedDriver", &pLunL1);
-            InsertConfigString(pLunL1, "Driver", "DebugAudio");
-
-            InsertConfigNode(pLunL1, "Config", &pCfg);
-            InsertConfigString(pCfg, "AudioDriver", "DebugAudio");
-            InsertConfigString(pCfg, "StreamName", bstr);
+# ifdef DEBUG_andy
+            strTmp = "1"; /* Always use the debugging backend. */
+# else
+            GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/Audio/Debug/Enabled", &strTmp);
+# endif
+            if (!strTmp.isEmpty())
+            {
+                LogRel(("Audio: Debugging enabled\n"));
+
+                /*
+                 * The audio debugging backend.
+                 */
+                CFGMR3InsertNodeF(pInst, &pLunL1, "LUN#%RU8", u8AudioLUN++);
+                InsertConfigString(pLunL1, "Driver", "AUDIO");
+
+                InsertConfigNode(pLunL1, "AttachedDriver", &pLunL1);
+                InsertConfigString(pLunL1, "Driver", "DebugAudio");
+
+                InsertConfigNode(pLunL1, "Config", &pCfg);
+                InsertConfigString(pCfg, "AudioDriver", "DebugAudio");
+            }
 #endif /* VBOX_WITH_AUDIO_DEBUG */