diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 28e9877..c897f65 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -322,6 +322,24 @@
 #define SEGMENT_SIZE 65535
 #endif
 
+#if defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H)
+#define USE_BLUETOOTH 1
+#if defined(__FreeBSD__)
+#define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
+#define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
+#define sockaddr_l2 sockaddr_l2cap
+#define sockaddr_rc sockaddr_rfcomm
+#define _BT_SOCKADDR_MEMB(s, proto) &((s)->sock_addr)
+#define _BT_L2_MEMB(sa, memb) ((sa)->l2cap_##memb)
+#define _BT_RC_MEMB(sa, memb) ((sa)->rfcomm_##memb)
+#else
+#define _BT_SOCKADDRMEMB(s, proto) (&((s)->sock_addr).bt_##proto)
+#define _BT_L2_MEMB(sa, memb) ((sa)->l2_##memb)
+#define _BT_RC_MEMB(sa, memb) ((sa)->rc_##memb)
+#define _BT_SCO_MEMB(sa, memb) ((sa)->sco_##memb)
+#endif
+#endif
+
 /*
  * Constants for getnameinfo()
  */
@@ -1012,18 +1030,18 @@
 	}
 #endif
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef USE_BLUETOOTH
 	case AF_BLUETOOTH:
 	{
 		switch( s->sock_proto )
 		{
 			case BTPROTO_L2CAP:
 			{
-				struct sockaddr_l2* addr = (struct sockaddr_l2*) &(s->sock_addr).bt_l2;
-				bdaddr_t* bdaddr = &(addr->l2_bdaddr);
+				struct sockaddr_l2* addr = (struct sockaddr_l2*)_BT_SOCKADDR_MEMB(s, l2);
+				bdaddr_t* bdaddr = &_BT_L2_MEMB(addr, bdaddr);
 
-				addr->l2_family = AF_BLUETOOTH;
-				if( !PyArg_ParseTuple(args, "(iiiiii)i", &bdaddr->b[0], &bdaddr->b[1], &bdaddr->b[2], &bdaddr->b[3], &bdaddr->b[4], &bdaddr->b[5], &addr->l2_psm) )
+				_BT_L2_MEMB(addr, family) = AF_BLUETOOTH;
+				if( !PyArg_ParseTuple(args, "(iiiiii)i", &bdaddr->b[0], &bdaddr->b[1], &bdaddr->b[2], &bdaddr->b[3], &bdaddr->b[4], &bdaddr->b[5], &_BT_L2_MEMB(addr, psm)) )
 				{
 					PyErr_SetString(socket_error, "getsockaddrarg: wrong format");
 					return 0;
@@ -1035,11 +1053,11 @@
 			}
 			case BTPROTO_RFCOMM:
 			{
-				struct sockaddr_rc* addr = (struct sockaddr_rc*) &(s->sock_addr).bt_rc;
-				bdaddr_t* bdaddr = &(addr->rc_bdaddr);
+				struct sockaddr_rc* addr = (struct sockaddr_rc*)_BT_SOCKADDR_MEMB(s, rc);
+				bdaddr_t* bdaddr = &_BT_RC_MEMB(addr, bdaddr);
 
-				addr->rc_family = AF_BLUETOOTH;
-				if( !PyArg_ParseTuple(args, "(iiiiii)i", &bdaddr->b[0], &bdaddr->b[1], &bdaddr->b[2], &bdaddr->b[3], &bdaddr->b[4], &bdaddr->b[5], &addr->rc_channel) )
+				_BT_RC_MEMB(addr, family) = AF_BLUETOOTH;
+				if( !PyArg_ParseTuple(args, "(iiiiii)i", &bdaddr->b[0], &bdaddr->b[1], &bdaddr->b[2], &bdaddr->b[3], &bdaddr->b[4], &bdaddr->b[5], &_BT_RC_MEMB(addr, channel)) )
 				{
 					PyErr_SetString(socket_error, "getsockaddrarg: wrong format");
 					return 0;
@@ -1049,12 +1067,13 @@
 				*len_ret = sizeof *addr;
 				return 1;
 			}
+#if !defined(__FreeBSD__)
 			case BTPROTO_SCO:
 			{
-				struct sockaddr_sco* addr = (struct sockaddr_sco*) &(s->sock_addr).bt_sco;
-				bdaddr_t* bdaddr = &(addr->sco_bdaddr);
+				struct sockaddr_sco* addr = (struct sockaddr_sco*)_BT_SOCKADDR_MEMB(s, sco);
+				bdaddr_t* bdaddr = &_BT_SCO_MEMB(addr, bdaddr);
 
-				addr->sco_family = AF_BLUETOOTH;
+				_BT_SCO_MEMB(addr, family) = AF_BLUETOOTH;
 				if( !PyArg_ParseTuple(args, "iiiiii", &bdaddr->b[0], &bdaddr->b[1], &bdaddr->b[2], &bdaddr->b[3], &bdaddr->b[4], &bdaddr->b[5]) )
 				{
 					PyErr_SetString(socket_error, "getsockaddrarg: wrong format");
@@ -1065,6 +1084,7 @@
 				*len_ret = sizeof *addr;
 				return 1;
 			}
+#endif
 			default:
 			{
 				PyErr_SetString(socket_error, "getsockaddrarg: unknown Bluetooth protocol");
@@ -1147,7 +1167,7 @@
 	}
 #endif
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef USE_BLUETOOTH
 	case AF_BLUETOOTH:
 	{
 		switch(s->sock_proto)
@@ -1162,11 +1182,13 @@
 				*len_ret = sizeof (struct sockaddr_rc);
 				return 1;
 			}
+#if !defined(__FreeBSD__)
 			case BTPROTO_SCO:
 			{
 				*len_ret = sizeof (struct sockaddr_sco);
 				return 1;
 			}
+#endif
 			default:
 			{
 				PyErr_SetString(socket_error, "getsockaddrlen: unknown BT protocol");
@@ -3665,10 +3687,12 @@
 	PyModule_AddIntConstant(m, "AF_ROSE", AF_ROSE);
 #endif
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef USE_BLUETOOTH
 	PyModule_AddIntConstant(m, "AF_BLUETOOTH", AF_BLUETOOTH);
 	PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
+#if !defined(__FreeBSD__)
 	PyModule_AddIntConstant(m, "BTPROTO_SCO", BTPROTO_SCO);
+#endif
 	PyModule_AddIntConstant(m, "BTPROTO_RFCOMM", BTPROTO_RFCOMM);
 	PyModule_AddObject(m, "BDADDR_ANY", Py_BuildValue( "iiiiii", 0,0,0,0,0,0 ) );
 	PyModule_AddObject(m, "BDADDR_LOCAL", Py_BuildValue( "iiiiii", 0,0,0,0xff,0xff,0xff ) );
diff --git a/configure b/configure
index 0f8d4fb..7b3017c 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.447 .
+# From configure.in Revision: 1.449 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57 for python 2.4.
 #
@@ -4350,6 +4350,7 @@
 
 
 
+
 for ac_header in dlfcn.h fcntl.h grp.h limits.h langinfo.h \
 libintl.h locale.h ncurses.h poll.h pthread.h \
 signal.h stdarg.h stddef.h stdlib.h stropts.h termios.h thread.h \
@@ -4357,7 +4358,8 @@
 sys/audioio.h sys/bsdtty.h sys/file.h sys/lock.h sys/mkdev.h sys/modem.h \
 sys/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \
 sys/un.h sys/utsname.h sys/wait.h pty.h term.h libutil.h \
-sys/resource.h netpacket/packet.h sysexits.h bluetooth/bluetooth.h
+sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
+bluetooth/bluetooth.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/configure.in b/configure.in
index 0f7ebdf..8eb0008 100644
--- a/configure.in
+++ b/configure.in
@@ -918,7 +918,8 @@
 sys/audioio.h sys/bsdtty.h sys/file.h sys/lock.h sys/mkdev.h sys/modem.h \
 sys/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \
 sys/un.h sys/utsname.h sys/wait.h pty.h term.h libutil.h \
-sys/resource.h netpacket/packet.h sysexits.h bluetooth/bluetooth.h)
+sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
+bluetooth/bluetooth.h)
 AC_HEADER_DIRENT
 AC_HEADER_MAJOR
 
diff --git a/pyconfig.h.in b/pyconfig.h.in
index f4ba0fc..a90ffaf 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -40,6 +40,9 @@
 /* Define to 1 if you have the <bluetooth/bluetooth.h> header file. */
 #undef HAVE_BLUETOOTH_BLUETOOTH_H
 
+/* Define to 1 if you have the <bluetooth.h> header file. */
+#undef HAVE_BLUETOOTH_H
+
 /* Define if nice() returns success/failure instead of the new priority. */
 #undef HAVE_BROKEN_NICE