diff --git a/lib/libbluetooth/sdp.h b/lib/libbluetooth/sdp.h
index 94978ba75c9f..d8594eb71537 100644
--- a/lib/libbluetooth/sdp.h
+++ b/lib/libbluetooth/sdp.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdp.h,v 1.1 2009/05/12 10:05:06 plunky Exp $	*/
+/*	$NetBSD: sdp.h,v 1.2 2009/07/25 17:04:51 plunky Exp $	*/
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -159,6 +159,8 @@
 #define SDP_UUID_PROTOCOL_AVDTP				0x0019
 #define SDP_UUID_PROTOCOL_CMPT				0x001B
 #define SDP_UUID_PROTOCOL_UDI_C_PLANE			0x001D
+#define SDP_UUID_PROTOCOL_MCAP_CONTROL_CHANNEL		0x001E
+#define SDP_UUID_PROTOCOL_MCAP_DATA_CHANNEL		0x001F
 #define SDP_UUID_PROTOCOL_L2CAP				0x0100
 
 /*
@@ -212,6 +214,13 @@
 #define SDP_SERVICE_CLASS_UDI_TA			0x112B
 #define SDP_SERVICE_CLASS_AUDIO_VIDEO			0x112C
 #define SDP_SERVICE_CLASS_SIM_ACCESS			0x112D
+#define SDP_SERVICE_CLASS_PHONEBOOK_ACCESS_PCE		0x112E
+#define SDP_SERVICE_CLASS_PHONEBOOK_ACCESS_PSE		0x112F
+#define SDP_SERVICE_CLASS_PHONEBOOK_ACCESS		0x1130
+#define SDP_SERVICE_CLASS_HEADSET_HS			0x1131
+#define SDP_SERVICE_CLASS_MESSAGE_ACCESS_SERVER		0x1132
+#define SDP_SERVICE_CLASS_MESSAGE_NOTIFICATION_SERVER	0x1133
+#define SDP_SERVICE_CLASS_MESSAGE_ACCESS_PROFILE	0x1134
 #define SDP_SERVICE_CLASS_PNP_INFORMATION		0x1200
 #define SDP_SERVICE_CLASS_GENERIC_NETWORKING		0x1201
 #define SDP_SERVICE_CLASS_GENERIC_FILE_TRANSFER		0x1202
@@ -222,6 +231,12 @@
 #define SDP_SERVICE_CLASS_ESDP_UPNP_IP_PAN		0x1300
 #define SDP_SERVICE_CLASS_ESDP_UPNP_IP_LAP		0x1301
 #define SDP_SERVICE_CLASS_ESDP_UPNP_L2CAP		0x1302
+#define SDP_SERVICE_CLASS_VIDEO_SOURCE			0x1303
+#define SDP_SERVICE_CLASS_VIDEO_SINK			0x1304
+#define SDP_SERVICE_CLASS_VIDEO_DISTRIBUTION		0x1305
+#define SDP_SERVICE_CLASS_HDP				0x1400
+#define SDP_SERVICE_CLASS_HDP_SOURCE			0x1401
+#define SDP_SERVICE_CLASS_HDP_SINK			0x1402
 
 /*
  * Universal Attribute definitions valid in all service classes
@@ -262,12 +277,15 @@
 
 /* Other profile attribute definitions */
 #define SDP_ATTR_IP_SUBNET				0x0200
+#define SDP_ATTR_SUPPORT_FEATURES_LIST			0x0200
 #define SDP_ATTR_SERVICE_VERSION			0x0300
+#define SDP_ATTR_DATA_EXCHANGE_SPECIFICATION		0x0301
 #define SDP_ATTR_EXTERNAL_NETWORK			0x0301
 #define SDP_ATTR_NETWORK				0x0301
 #define SDP_ATTR_SUPPORTED_DATA_STORES_LIST		0x0301
 #define SDP_ATTR_FAX_CLASS1_SUPPORT			0x0302
 #define SDP_ATTR_REMOTE_AUDIO_VOLUME_CONTROL		0x0302
+#define SDP_ATTR_MCAP_SUPPORTED_PROCEDURES		0x0302
 #define SDP_ATTR_FAX_CLASS20_SUPPORT			0x0303
 #define SDP_ATTR_SUPPORTED_FORMATS_LIST			0x0303
 #define SDP_ATTR_FAX_CLASS2_SUPPORT			0x0304
@@ -285,6 +303,9 @@
 #define SDP_ATTR_SUPPORTED_FEATURES			0x0311
 #define SDP_ATTR_SUPPORTED_FUNCTIONS			0x0312
 #define SDP_ATTR_TOTAL_IMAGING_DATA_CAPACITY		0x0313
+#define SDP_ATTR_SUPPORTED_REPOSITORIES			0x0314
+#define SDP_ATTR_MAS_INSTANCE_ID			0x0315
+#define SDP_ATTR_SUPPORTED_MESSAGE_TYPES		0x0316
 
 /*
  * Protocol Data Unit (PDU) header format