diff -bBdurNP bluez-utils-2.7-orig/hcid/hcid.conf bluez-utils-2.7/hcid/hcid.conf
--- bluez-utils-2.7-orig/hcid/hcid.conf	2004-05-09 03:39:43.000000000 -0700
+++ bluez-utils-2.7/hcid/hcid.conf	2004-06-28 02:42:14.973160280 -0700
@@ -23,7 +23,7 @@
 	pairing multi;
 
 	# PIN helper
-	pin_helper /usr/bin/bluepin;
+	pin_helper /etc/bluetooth/bluepin;
 
 	# D-Bus PIN helper
 	#dbus_pin_helper;
@@ -34,10 +34,10 @@
 	# Local device name
 	#   %d - device id
 	#   %h - host name
-	name "BlueZ (%d)";
+	name "Gumstix (%d)";
 
 	# Local device class
-	class 0x3e0100;
+	class 0x820116;
 
 	# Default packet type
 	#pkt_type DH1,DM1,HV1;
--- bluez-utils-2.7-orig/scripts/bluetooth.default	2004-05-09 03:39:43.000000000 -0700
+++ bluez-utils-2.7/scripts/bluetooth.default	2004-06-28 02:34:04.270181810 -0700
@@ -1,5 +1,13 @@
 # Bluetooth configuraton file
 
+# Bind to a serial port by default?
+HCIATTACH_ENABLE=true
+HCIATTACH_TTY=/dev/ttyS3
+HCIATTACH_TYPE=ericsson
+HCIATTACH_START_SPEED=57600
+HCIATTACH_SPEED=921600
+HCIATTACH_HANDSHAKE=
+
 # Start of hcid (allowed values are "true" and "false")
 HCID_ENABLE=true
 
@@ -10,13 +18,13 @@
 SDPD_ENABLE=true
 
 # Start hidd (allowed values are "true" and "false")
-HIDD_ENABLE=true
+HIDD_ENABLE=false
 
 # Arguments to hidd
 HIDD_OPTIONS=""
 
 # Run hid2hci (allowed values are "true" and "false")
-HID2HCI_ENABLE=true
+HID2HCI_ENABLE=false
 
 # Bind rfcomm devices (allowed values are "true" and "false")
 RFCOMM_ENABLE=true
@@ -31,7 +39,7 @@
 DUND_OPTIONS="--listen --persist"
 
 # Start pand (allowed values are "true" and "false")
-PAND_ENABLE=false
+PAND_ENABLE=true
 
 # Arguments to pand
-PAND_OPTIONS="--listen --role NAP"
+PAND_OPTIONS="--role PANU --search --persist"
--- bluez-utils-2.7-orig/scripts/bluetooth.init	2004-05-09 03:39:43.000000000 -0700
+++ bluez-utils-2.7/scripts/bluetooth.init	2004-06-28 02:39:34.144675969 -0700
@@ -9,6 +9,7 @@
 NAME=bluetooth
 DESC="Bluetooth subsystem"
 
+HCIATTACH_NAME=hciattach
 HCID_NAME=hcid
 SDPD_NAME=sdpd
 HIDD_NAME=hidd
@@ -17,6 +18,7 @@
 PAND_NAME=pand
 DUND_NAME=dund
 
+HCIATTACH_EXEC="`which $HCIATTACH_NAME || true`"
 HCID_EXEC="`which $HCID_NAME || true`"
 SDPD_EXEC="`which $SDPD_NAME || true`"
 HIDD_EXEC="`which $HIDD_NAME || true`"
@@ -25,26 +27,42 @@
 PAND_EXEC="`which $PAND_NAME || true`"
 DUND_EXEC="`which $DUND_NAME || true`"
 
+HCIATTACH_ENABLE=true
 HCID_ENABLE=true
 SDPD_ENABLE=true
 HIDD_ENABLE=false
 HID2HCI_ENABLE=false
 RFCOMM_ENABLE=true
 DUND_ENABLE=false
-PAND_ENABLE=false
+PAND_ENABLE=true
 
+HCIATTACH_TTY=/dev/ttyS3
+HCIATTACH_TYPE=ericsson
+HCIATTACH_START_SPEED=57600
+HCIATTACH_SPEED=921600
+HCIATTACH_HANDSHAKE=flow
 HCID_CONFIG="/etc/bluetooth/hcid.conf"
 RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
 
 HIDD_OPTIONS=""
 DUND_OPTIONS=""
-PAND_OPTIONS=""
+PAND_OPTIONS="--role PANU --search -Q10"
 
 [ -e /etc/default/bluetooth ] && . /etc/default/bluetooth
 
 case "$1" in
   start)
+	/sbin/modprobe gumstix_bluetooth
+	/sbin/modprobe proc_gpio
+	echo clear > /proc/gpio/GPIO7
+	echo set > /proc/gpio/GPIO7
+	sleep 2
+
 	echo -n "Starting $DESC:"
+	if $HCIATTACH_ENABLE && [ -x "$HCIATTACH_EXEC" ] ; then
+		$HCIATTACH_EXEC -s $HCIATTACH_START_SPEED $HCIATTACH_TTY $HCIATTACH_TYPE $HCIATTACH_SPEED $HCIATTACH_HANDSHAKE
+		echo -n " $HCIATTACH_TTY"
+	fi
 	if $HCID_ENABLE && [ -x "$HCID_EXEC" -a -f "$HCID_CONFIG" ] ; then
 		$HCID_EXEC -f $HCID_CONFIG
 		echo -n " $HCID_NAME"
@@ -83,6 +93,7 @@
 	;;
   stop)
 	echo -n "Stopping $DESC:"
+	[ -x "$PAND_EXEC" ] && $PAND_EXEC --killall
 	killall $PAND_NAME > /dev/null 2>&1 || true
 	echo -n " $PAND_NAME"
 	killall $DUND_NAME > /dev/null 2>&1 || true
@@ -91,6 +102,8 @@
 	echo -n " $SDPD_NAME"
 	killall $HCID_NAME > /dev/null 2>&1 || true
 	echo -n " $HCID_NAME"
+	killall $HCIATTACH_NAME > /dev/null 2>&1 || true
+	echo -n " $HCIATTACH_TTY"
 	echo "."
 	;;
   *)