diff --git a/Makefile.in b/Makefile.in
index 128800d0b..fda02ac07 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -456,8 +456,6 @@ distrib-nocheck: $(DISTRIB_ROOT) doc
               $(TOP_DIR)/obj/.depend \
               $(TOP_DIR)/obj/x86_WIN32 \
               $(TOP_DIR)/obj/x86_LINUX \
-              $(TOP_DIR)/obj/ppc_DARWIN \
-              $(TOP_DIR)/obj/sparc_SOLARIS \
               $(TOP_DIR)/test \
               $(TOP_DIR)/test/small1 \
               $(TOP_DIR)/ocamlutil
diff --git a/config.guess b/config.guess
index c085f4f51..4bf27fc41 100755
--- a/config.guess
+++ b/config.guess
@@ -771,8 +771,8 @@ EOF
 	case ${UNAME_MACHINE} in
 	    pc98)
 		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+# 	    amd64)
+# 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
 		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
diff --git a/configure b/configure
index 3bcd04210..e1aec03c4 100755
--- a/configure
+++ b/configure
@@ -4201,15 +4201,42 @@ done
 # ----------- platform-specific code -------------
 # $target is typically processor-vendor-os
 case "$target" in
-  # linux
-  *86*linux*|*86*freebsd*|*86*openbsd*|*86*darwin*)
+
+  *86*linux*)
     echo "$as_me:$LINENO: result: configuring for linux/x86" >&5
 echo "${ECHO_T}configuring for linux/x86" >&6
 
     ARCHOS=x86_LINUX
     ;;
 
+  *86*openbsd*)
+    echo "$as_me:$LINENO: result: configuring for OpenBSD/x86" >&5
+echo "${ECHO_T}configuring for OpenBSD/x86" >&6
+
+    ARCHOS=x86_OPENBSD
+    ;;
+
+  *i386*freebsd*|*amd64*freebsd*)
+
+    if test x"${ARCH}" = x""; then
+       ARCH=`uname -p`
+    fi
+
+    echo "$as_me:$LINENO: result: configuring for freebsd/${ARCH}" >&5
+echo "${ECHO_T}configuring for freebsd/${ARCH}" >&6
+
+    ARCHOS=${ARCH}_FREEBSD
+    ;;
+
+
   # Mac OS X
+  *86*darwin*)
+    echo "$as_me:$LINENO: result: configuring for darwin/x86" >&5
+echo "${ECHO_T}configuring for darwin/x86" >&6
+
+    ARCHOS=x86_DARWIN
+    ;;
+
   *powerpc*darwin*)
     echo "$as_me:$LINENO: result: configuring for powerpc/darwin" >&5
 echo "${ECHO_T}configuring for powerpc/darwin" >&6
@@ -4247,14 +4274,16 @@ echo "${ECHO_T}configuring for SPARC/Solaris" >&6
     { { echo "$as_me:$LINENO: error:
       Unsupported platform $target -- sorry.
       ./configure supports these platforms:
-         on x86:     Linux, Win32(with Cygwin), freeBSD, openBSD, and Mac OS X
+         on x86:     Linux, Win32(with Cygwin), FreeBSD, OpenBSD, and Mac OS X
+         on amd64:   FreeBSD
          on PowerPC: Mac OS X
          on SPARC:   Solaris
     " >&5
 echo "$as_me: error:
       Unsupported platform $target -- sorry.
       ./configure supports these platforms:
-         on x86:     Linux, Win32(with Cygwin), freeBSD, openBSD, and Mac OS X
+         on x86:     Linux, Win32(with Cygwin), FreeBSD, OpenBSD, and Mac OS X
+         on amd64:   FreeBSD
          on PowerPC: Mac OS X
          on SPARC:   Solaris
     " >&2;}
diff --git a/configure.in b/configure.in
index 35f5fbe3c..46a3fdd5c 100644
--- a/configure.in
+++ b/configure.in
@@ -384,14 +384,38 @@ AC_CHECK_FUNCS(mkdir select socket __sysv_signal)
 # ----------- platform-specific code -------------
 # $target is typically processor-vendor-os
 case "$target" in
-  # linux
-  *86*linux*|*86*freebsd*|*86*openbsd*|*86*darwin*)
+
+  *86*linux*)
     AC_MSG_RESULT(configuring for linux/x86)
 
     ARCHOS=x86_LINUX
     ;;
 
+  *86*openbsd*)
+    AC_MSG_RESULT(configuring for OpenBSD/x86)
+
+    ARCHOS=x86_OPENBSD
+    ;;
+
+  *i386*freebsd*|*amd64*freebsd*)
+
+    if test x"${ARCH}" = x""; then
+       ARCH=`uname -p`
+    fi
+
+    AC_MSG_RESULT(configuring for freebsd/${ARCH})
+
+    ARCHOS=${ARCH}_FREEBSD
+    ;;
+
+
   # Mac OS X
+  *86*darwin*)
+    AC_MSG_RESULT(configuring for darwin/x86)
+
+    ARCHOS=x86_DARWIN
+    ;;
+
   *powerpc*darwin*)
     AC_MSG_RESULT(configuring for powerpc/darwin, which we treat like linux/x86)
 
@@ -426,7 +450,8 @@ case "$target" in
     AC_MSG_ERROR([
       Unsupported platform $target -- sorry.
       ./configure supports these platforms:
-         on x86:     Linux, Win32(with Cygwin), freeBSD, openBSD, and Mac OS X
+         on x86:     Linux, Win32(with Cygwin), FreeBSD, OpenBSD, and Mac OS X
+         on amd64:   FreeBSD
          on PowerPC: Mac OS X 
          on SPARC:   Solaris
     ])
diff --git a/doc/cil.tex b/doc/cil.tex
index 9fbf8a312..5299c3de5 100644
--- a/doc/cil.tex
+++ b/doc/cil.tex
@@ -282,9 +282,11 @@ \section{Installation}
 \item On Linux, using \t{gcc} version 2.95.3, 3.0, 3.2, 3.3, and 4.0.
 \end{itemize}
 
-Others have successfully used CIL with Mac OS X (on both PowerPC and
-x86), Solaris, and *BSD.  If you make any changes to the build
-system in order to run CIL on your platform, please send us a patch.
+Others have successfully used CIL on x86 processors with Mac OS X,
+FreeBSD and OpenBSD; on amd64 processors with FreeBSD; on SPARC
+processors with Solaris; and on PowerPC processors with Mac OS X.  If
+you make any changes to the build system in order to run CIL on your
+platform, please send us a patch.
 
   \subsection{Building CIL on Windows with Microsoft Visual C}
 
@@ -3121,6 +3123,8 @@ \section{Bug reports}
 
 \section{Changes}\label{sec-changes}\cutname{changes.html}
 \begin{itemize}
+\item {\bf August 6, 2006}: Joseph Koshy patched \t{./configure} for
+  FreeBSD on amd64.
 \item {\bf July 27, 2006}: CIL files now include the prototypes of
   builtin functions (such as \t{\_\_builtin\_va\_arg}).  This
   preserves the invariant that every function call has a corresponding