diff --git a/configure/os/CONFIG.linux-x86.linux-x86-debug b/configure/os/CONFIG.linux-x86.linux-x86-debug
index b65c5bc80..cad9189c9 100644
--- a/configure/os/CONFIG.linux-x86.linux-x86-debug
+++ b/configure/os/CONFIG.linux-x86.linux-x86-debug
@@ -7,7 +7,10 @@
 # Sites may override these definitions in CONFIG_SITE.linux-x86.linux-x86-debug
 #-------------------------------------------------------
 
-include $(CONFIG)/os/CONFIG.linux-x86-debug.linux-x86-debug
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
 
-BUILD_CLASS = HOST
+# This will cause build failure when used with make -j option
+# See base/src/bpt MAKEBPT
+#BUILD_CLASS = HOST
 
+CROSS_OPT=NO