diff --git a/config/CONFIG.Host.freebsd b/config/CONFIG.Host.freebsd
index d68fa0822..ac9e168b3 100644
--- a/config/CONFIG.Host.freebsd
+++ b/config/CONFIG.Host.freebsd
@@ -12,23 +12,18 @@
 #  Sites may override these definitions in CONFIG_SITE.Host.freebsd
  
 OS_CLASS = freebsd
-ARCH_CLASS = x86_64
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
 
-ARCH_DEP_CPPFLAGS += -D_X86_64_
-
 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
 RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
diff --git a/config/CONFIG.Host.freebsd-x86 b/config/CONFIG.Host.freebsd-x86
new file mode 100644
index 000000000..f6f517725
--- /dev/null
+++ b/config/CONFIG.Host.freebsd-x86
@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+ARCH_CLASS = x86
+
+-include $(EPICS_BASE)/config/CONFIG.Host.freebsd
+
+ARCH_DEP_CPPFLAGS += -D_X86_
diff --git a/config/CONFIG.Host.freebsd-x86_64 b/config/CONFIG.Host.freebsd-x86_64
index 23265cb67..b76983b52 100644
--- a/config/CONFIG.Host.freebsd-x86_64
+++ b/config/CONFIG.Host.freebsd-x86_64
@@ -1,12 +1,15 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
+# EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 # $Id$
 
+ARCH_CLASS = x86_64
+
 -include $(EPICS_BASE)/config/CONFIG.Host.freebsd
+
+ARCH_DEP_CPPFLAGS += -D_X86_64_
diff --git a/config/CONFIG_HOST_ARCH.freebsd-x86_64 b/config/CONFIG_HOST_ARCH.freebsd-x86_64
index f8b1b1b81..afdde073e 100644
--- a/config/CONFIG_HOST_ARCH.freebsd-x86_64
+++ b/config/CONFIG_HOST_ARCH.freebsd-x86_64
@@ -9,6 +9,3 @@
 # $Id$
 
 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
-
-WIND_HOST_TYPE = i386-linux2
-