--- bluez-utils-2.14/hcid/hcid.conf.defaultconf	2004-12-25 19:06:00.000000000 +0100
+++ bluez-utils-2.14/hcid/hcid.conf	2005-01-27 11:02:49.922071071 +0100
@@ -34,7 +34,7 @@
 	# Local device name
 	#   %d - device id
 	#   %h - host name
-	name "BlueZ (%d)";
+	name "%h-%d";
 
 	# Local device class
 	class 0x3e0100;
--- bluez-utils-2.14/rfcomm/rfcomm.conf.defaultconf	2002-10-07 07:58:18.000000000 +0200
+++ bluez-utils-2.14/rfcomm/rfcomm.conf	2005-01-27 10:53:15.166082129 +0100
@@ -4,16 +4,19 @@
 # $Id: rfcomm.conf,v 1.1 2002/10/07 05:58:18 maxk Exp $
 #
 
-rfcomm0 {
-	# Automatically bind the device at startup
-	bind no;
-
-	# Bluetooth address of the device
-	device 11:22:33:44:55:66;
-
-	# RFCOMM channel for the connection
-	channel	1;
-
-	# Description of the connection
-	comment "Example Bluetooth device";
-}
+#
+# Example:
+#
+#rfcomm0 {
+#	# Automatically bind the device at startup
+#	bind no;
+#
+#	# Bluetooth address of the device
+#	device 11:22:33:44:55:66;
+#
+#	# RFCOMM channel for the connection
+#	channel	1;
+#
+#	# Description of the connection
+#	comment "Example Bluetooth device";
+#}