--- tools/inc/inetdef.hxx.orig	Fri Sep  9 09:42:51 2005
+++ tools/inc/inetdef.hxx	Thu May 25 18:31:02 2006
@@ -65,7 +65,9 @@
 #elif defined LINUX && defined X86
 #define TOOLS_INETDEF_OS "Linux"
 #elif defined FREEBSD && defined X86
-#define TOOLS_INETDEF_OS "FreeBSD"
+#define TOOLS_INETDEF_OS "FreeBSD/i386"
+#elif defined FREEBSD && defined X86_64
+#define TOOLS_INETDEF_OS "FreeBSD/amd64"
 #elif defined SINIX
 #define TOOLS_INETDEF_OS "SINIX"
 #elif defined IRIX
--- tools/inc/solar.h.orig	Wed Apr 26 16:42:59 2006
+++ tools/inc/solar.h	Thu May 25 18:37:19 2006
@@ -397,9 +397,12 @@
 #elif defined LINUX && defined __x86_64__
   #define __DLLEXTENSION "lx.so"
   #define SYSTEM_ID 		SYSTEM_UNXLNXX
-#elif defined FREEBSD
+#elif defined FREEBSD && defined X86
   #define __DLLEXTENSION "fi.so"
   #define SYSTEM_ID 		SYSTEM_UNXFBSDI
+#elif defined FREEBSD && defined X86_64
+  #define __DLLEXTENSION "fx.so"
+  #define SYSTEM_ID 		SYSTEM_UNXFBSDX
 #elif defined IRIX
   #define __DLLEXTENSION "im.so"
   #define SYSTEM_ID 		SYSTEM_UNXIRXM