diff --git a/configure/os/CONFIG.Common.linux-x86 b/configure/os/CONFIG.Common.linux-x86
index 996cb6a2e..d777a1741 100644
--- a/configure/os/CONFIG.Common.linux-x86
+++ b/configure/os/CONFIG.Common.linux-x86
@@ -25,16 +25,26 @@ OP_SYS_CPPFLAGS += -Dlinux
 OP_SYS_LDLIBS += -lrt
 
 ARCH_DEP_CPPFLAGS += -D_X86_
-ARCH_DEP_CFLAGS += -mcpu=pentium
-#athlon flags
-#ARCH_DEP_CFLAGS += -mcpu=athlon-mp -march=athlon-mp -mfpmath=sse
 
 # Set runtime path for shared libraries
 RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%)
 
 ifdef CROSS
+ifeq ($(EPICS_HOST_ARCH),linux-x86)
+   # Added for 386,486,... cross builds
+   CMPLR_PREFIX=
+   CROSS_INCLUDES=
+   CROSS_LDFLAGS=
+   # Use -w not -Wall
+   #WARN_CFLAGS_YES = -w
+   #WARN_CXXFLAGS_YES = -w
+-include $(CONFIG)/os/CONFIG_SITE.Common.linux-x86
+-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+-include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-x86
+else
    GNU_TARGET=i586-pc-linux-gnu
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
 endif
+endif