diff --git a/THANKS b/THANKS
index 94c191b42..80e9e8a5d 100644
--- a/THANKS
+++ b/THANKS
@@ -13,3 +13,4 @@ Sam Steingold			<sds@gnu.org>
 Jens Troeger                    <savage@light-speed.de>
 Tom Tromey                      <tromey@redhat.com>
 Trent Nelson                    <trent@snakebite.org>
+Vitaly Magerya                  <vmagerya@gmail.com>
diff --git a/configure.ac b/configure.ac
index 02012b60f..4a10b6b7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,6 +87,7 @@ else
 fi
 
 case "$host_os" in
+    *freebsd*)		SHLIB=""	;;
     *hpux*)		SHLIB="-ldld"	;;
     *)			SHLIB="-ldl"	;;
 esac
@@ -94,7 +95,7 @@ AC_SUBST(SHLIB)
 
 cpu=
 case "$target_cpu" in
-    i?86|x86_64)	cpu=x86		;;
+    i?86|x86_64|amd64)	cpu=x86		;;
     *arm*)		cpu=arm		;;
     *mips*)		cpu=mips	;;
     *powerpc*)		cpu=ppc		;;