diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 1414218953..992de34f8a 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -36,6 +36,7 @@
   DEFINE SECURE_BOOT_ENABLE      = FALSE
 
 [BuildOptions]
+  GCC:*_UNIXGCC_*_CC_FLAGS             = -DMDEPKG_NDEBUG
   GCC:RELEASE_*_*_CC_FLAGS             = -DMDEPKG_NDEBUG
   INTEL:RELEASE_*_*_CC_FLAGS           = /D MDEPKG_NDEBUG
   MSFT:RELEASE_*_*_CC_FLAGS            = /D MDEPKG_NDEBUG
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 957f394bc3..319066c689 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -36,6 +36,7 @@
   DEFINE SECURE_BOOT_ENABLE      = FALSE
 
 [BuildOptions]
+  GCC:*_UNIXGCC_*_CC_FLAGS             = -DMDEPKG_NDEBUG
   GCC:RELEASE_*_*_CC_FLAGS             = -DMDEPKG_NDEBUG
   INTEL:RELEASE_*_*_CC_FLAGS           = /D MDEPKG_NDEBUG
   MSFT:RELEASE_*_*_CC_FLAGS            = /D MDEPKG_NDEBUG
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index b56c551f74..636db05607 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -36,6 +36,7 @@
   DEFINE SECURE_BOOT_ENABLE      = FALSE
 
 [BuildOptions]
+  GCC:*_UNIXGCC_*_CC_FLAGS             = -DMDEPKG_NDEBUG
   GCC:RELEASE_*_*_CC_FLAGS             = -DMDEPKG_NDEBUG
   INTEL:RELEASE_*_*_CC_FLAGS           = /D MDEPKG_NDEBUG
   MSFT:RELEASE_*_*_CC_FLAGS            = /D MDEPKG_NDEBUG
diff --git a/OvmfPkg/README b/OvmfPkg/README
index 04a658fa31..51041a0551 100644
--- a/OvmfPkg/README
+++ b/OvmfPkg/README
@@ -115,3 +115,22 @@ To add network drivers to OVMF:
     -net nic,model=e1000,addr=3 -net nic,model=e1000,addr=4
     -net user,restrict=yes -net user,dhcpstart=10.0.2.10
 
+=== UNIXGCC Debug ===
+
+If you build with the UNIXGCC toolchain, then debugging will be disabled
+due to larger image sizes being produced by the UNIXGCC toolchain. The
+first choice recommendation is to use GCC44 or newer instead.
+
+If you must use UNIXGCC, then you can override the build options for
+particular libraries and modules in the .dsc to re-enable debugging
+selectively. For example:
+  [Components]
+  OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf {
+    <BuildOptions>
+      GCC:*_*_*_CC_FLAGS             = -UMDEPKG_NDEBUG
+  }
+  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf {
+    <BuildOptions>
+      GCC:*_*_*_CC_FLAGS             = -UMDEPKG_NDEBUG
+  }
+