diff --git a/configure/os/CONFIG.Common.freebsd-x86 b/configure/os/CONFIG.Common.freebsd-x86
new file mode 100644
index 000000000..cc8c39ab8
--- /dev/null
+++ b/configure/os/CONFIG.Common.freebsd-x86
@@ -0,0 +1,34 @@
+# $Id$
+#
+# This file is maintained by the build community.
+#
+# Definitions for freebsd-x86 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.freebsd-x86
+#-------------------------------------------------------
+
+# Include definitions common to all freebsd targets
+include $(CONFIG)/os/CONFIG.Common.freebsdCommon
+
+ARCH_CLASS = x86
+
+ARCH_DEP_CPPFLAGS += -D_X86_
+
+ifeq ($(BUILD_CLASS),CROSS)
+ifeq ($(EPICS_HOST_ARCH),freebsd-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.freebsd-x86
+-include $(CONFIG)/os/CONFIG.freebsd-x86.freebsd-x86
+-include $(CONFIG)/os/CONFIG_SITE.freebsd-x86.freebsd-x86
+else
+   GNU_TARGET=i586-pc-freebsd-gnu
+   CMPLR_SUFFIX=
+   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
+endif
+endif
+
diff --git a/configure/os/CONFIG.Common.freebsdCommon b/configure/os/CONFIG.Common.freebsdCommon
index e8253a517..712ed03fc 100644
--- a/configure/os/CONFIG.Common.freebsdCommon
+++ b/configure/os/CONFIG.Common.freebsdCommon
@@ -13,14 +13,12 @@ OS_CLASS = freebsd
 
 CODE_CPPFLAGS = -D_REENTRANT
 
-#POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500
 POSIX_CPPFLAGS = -D_POSIX_THREADS
 POSIX_LDLIBS = -lpthread
 
 # -D_BSD_SOURCE for gethostname() in unistd.h as needed by cacChannelIO.cpp.
 OP_SYS_CPPFLAGS += -D_BSD_SOURCE
 OP_SYS_CPPFLAGS += -Dfreebsd
-#OP_SYS_LDLIBS += -lrt
 
 # Set runtime path for shared libraries
 SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
diff --git a/configure/os/CONFIG.freebsd-x86.Common b/configure/os/CONFIG.freebsd-x86.Common
new file mode 100644
index 000000000..7aa29b781
--- /dev/null
+++ b/configure/os/CONFIG.freebsd-x86.Common
@@ -0,0 +1,10 @@
+# $Id$
+#
+# This file is maintained by the build community.
+#
+# Definitions for freebsd host builds
+# Sites may override these definitions in CONFIG_SITE.freebsd-x86.Common
+#-------------------------------------------------------
+
+#Include definitions common to unix hosts
+include $(CONFIG)/os/CONFIG.UnixCommon.Common
diff --git a/configure/os/CONFIG.freebsd-x86.freebsd-x86 b/configure/os/CONFIG.freebsd-x86.freebsd-x86
new file mode 100644
index 000000000..dfa84b478
--- /dev/null
+++ b/configure/os/CONFIG.freebsd-x86.freebsd-x86
@@ -0,0 +1,19 @@
+# $Id$
+#
+# Definitions for freebsd-x86_64 host - freebsd-x86_64 target builds
+# Sites may override these definitions in CONFIG_SITE.freebsd-x86_64.freebsd-x86_64
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon
+
+GNU_DIR = /usr
+
+STATIC_LDFLAGS_YES= -Wl,-Bstatic
+STATIC_LDFLAGS_NO=
+STATIC_LDLIBS_YES= -Wl,-Bdynamic
+STATIC_LDLIBS_NO=
+
+SHRLIB_LDFLAGS +=  -shared -fPIC
+LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
+
diff --git a/configure/os/CONFIG.freebsd-x86_64.Common b/configure/os/CONFIG.freebsd-x86_64.Common
index 7b9307501..ada188917 100644
--- a/configure/os/CONFIG.freebsd-x86_64.Common
+++ b/configure/os/CONFIG.freebsd-x86_64.Common
@@ -3,7 +3,7 @@
 # This file is maintained by the build community.
 #
 # Definitions for freebsd host builds
-# Sites may override these definitions in CONFIG_SITE.freebsd.Common
+# Sites may override these definitions in CONFIG_SITE.freebsd-x86_64.Common
 #-------------------------------------------------------
 
 # Include definitions common to unix hosts
diff --git a/configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64 b/configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64
index 9fca74b78..dfa84b478 100644
--- a/configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64
+++ b/configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64
@@ -8,7 +8,6 @@
 include $(CONFIG)/CONFIG.gnuCommon
 
 GNU_DIR = /usr
-GNU_LDLIBS_YES =
 
 STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO=