diff --git a/AUTHORS b/AUTHORS
index 053960f..5855c2d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -75,6 +75,7 @@ N: Daniel J. O'Connor
 E: darius@dons.net.au
 D: Autoconf support and portability
 D: Corrected failed mmap checking
+D: FreeBSD support
 
 N: Tim Rowley
 E: tor@cs.brown.edu
diff --git a/CREDITS b/CREDITS
index 1f17532..5a61f48 100644
--- a/CREDITS
+++ b/CREDITS
@@ -34,6 +34,9 @@ Autoconf support and portability isues:
   Daniel J. O'Connor <darius@dons.net.au>
   Tim Rowley <tor@cs.brown.edu>
 
+FreeBSD support:
+  Daniel J. O'Connor <darius@dons.net.au>
+
 Makefile fixes:
   Tarjei Skorgenes <tarjei.skorgenes@online.no>
 
diff --git a/common/asm_i386.h b/common/asm_i386.h
index 98d92c9..5dad5b9 100644
--- a/common/asm_i386.h
+++ b/common/asm_i386.h
@@ -25,11 +25,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
 
+#ifdef __FreeBSD__
+#include <machine/asm.h>
+#define C(label) CNAME(label)
+#else
 #ifdef HAVE_SYM_PREFIX_UNDERSCORE
 # define C(label) _##label
 #else
 # define C(label) label
 #endif
+#endif
 
 //
 // !!! note that this file must match the corresponding C structures at all