diff --git a/audio/a2dp.c b/audio/a2dp.c
index b062aed..7b39c3d 100644
--- a/audio/a2dp.c
+++ b/audio/a2dp.c
@@ -369,10 +369,14 @@
 	sbc_cap.cap.media_type = AVDTP_MEDIA_TYPE_AUDIO;
 	sbc_cap.cap.media_codec_type = A2DP_CODEC_SBC;
 
+#ifdef ANDROID
+	sbc_cap.frequency = SBC_SAMPLING_FREQ_44100;
+#else
 	sbc_cap.frequency = ( SBC_SAMPLING_FREQ_48000 |
 				SBC_SAMPLING_FREQ_44100 |
 				SBC_SAMPLING_FREQ_32000 |
 				SBC_SAMPLING_FREQ_16000 );
+#endif
 
 	sbc_cap.channel_mode = ( SBC_CHANNEL_MODE_JOINT_STEREO |
 					SBC_CHANNEL_MODE_STEREO |
diff --git a/src/main.c b/src/main.c
index 6113217..85617a3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -44,6 +44,10 @@
 
 #include <glib.h>
 
+#ifdef ANDROID_EXPAND_NAME
+#include <cutils/properties.h>
+#endif
+
 #include <dbus/dbus.h>
 
 #include "log.h"
@@ -223,6 +227,10 @@
 	register int sp, np, olen;
 	char *opt, buf[10];
 
+#ifdef ANDROID_EXPAND_NAME
+	char value[PROPERTY_VALUE_MAX];
+#endif
+
 	if (!str || !dst)
 		return NULL;
 
@@ -242,6 +250,23 @@
 				opt = main_opts.host_name;
 				break;
 
+#ifdef ANDROID_EXPAND_NAME
+			case 'b':
+				property_get("ro.product.brand", value, "");
+				opt = value;
+			break;
+
+			case 'm':
+				property_get("ro.product.model", value, "");
+				opt = value;
+			break;
+
+			case 'n':
+				property_get("ro.product.name", value, "");
+				opt = value;
+			break;
+#endif
+
 			case '%':
 				dst[np++] = str[sp++];
 				/* fall through */