diff --git a/audio/Android.mk b/audio/Android.mk
index 7e764c5..525f04c 100755
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -20,7 +20,7 @@
 	unix.c
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\" \
+	-DVERSION=\"4.47\" \
 	-DSTORAGEDIR=\"/data/misc/bluetoothd\" \
 	-DCONFIGDIR=\"/etc/bluez\" \
 	-DANDROID \
diff --git a/input/Android.mk b/input/Android.mk
index 8b0750d..ce8b421 100755
--- a/input/Android.mk
+++ b/input/Android.mk
@@ -12,7 +12,7 @@
 	server.c
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\" \
+	-DVERSION=\"4.47\" \
 	-DSTORAGEDIR=\"/data/misc/bluetoothd\" \
 	-DCONFIGDIR=\"/etc/bluez\"
 
diff --git a/plugins/Android.mk b/plugins/Android.mk
index aded953..6302d00 100755
--- a/plugins/Android.mk
+++ b/plugins/Android.mk
@@ -10,7 +10,7 @@
 	hciops.c \
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\" \
+	-DVERSION=\"4.47\" \
 	-DBLUETOOTH_PLUGIN_BUILTIN \
 
 LOCAL_C_INCLUDES:= \
diff --git a/rfcomm/Android.mk b/rfcomm/Android.mk
index 9735613..c6bb00a 100755
--- a/rfcomm/Android.mk
+++ b/rfcomm/Android.mk
@@ -8,7 +8,7 @@
 	lexer.c
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\" \
+	-DVERSION=\"4.47\" \
 	-DCONFIGDIR=\"/etc/bluez\" \
 	-DNEED_PPOLL
 
diff --git a/src/Android.mk b/src/Android.mk
index 5a0089d..c4e8647 100755
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -24,7 +24,7 @@
 	storage.c
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\" \
+	-DVERSION=\"4.47\" \
 	-DSTORAGEDIR=\"/data/misc/bluetoothd\" \
 	-DCONFIGDIR=\"/etc/bluez\" \
 	-DSERVICEDIR=\"/system/bin\" \
diff --git a/test/Android.mk b/test/Android.mk
index 8c5fe53..68006aa 100755
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -9,7 +9,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\"
+	-DVERSION=\"4.47\"
 
 LOCAL_SRC_FILES:= \
 	hstest.c
@@ -34,7 +34,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\"
+	-DVERSION=\"4.47\"
 
 LOCAL_SRC_FILES:= \
 	l2test.c
@@ -59,7 +59,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\"
+	-DVERSION=\"4.47\"
 
 LOCAL_SRC_FILES:= \
 	rctest.c
@@ -85,7 +85,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\"
+	-DVERSION=\"4.47\"
 
 LOCAL_SRC_FILES:= \
 	scotest.c
@@ -110,7 +110,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\"
+	-DVERSION=\"4.47\"
 
 LOCAL_SRC_FILES:= \
 	agent.c
@@ -136,7 +136,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\"
+	-DVERSION=\"4.47\"
 
 LOCAL_SRC_FILES:= \
 	attest.c
@@ -161,7 +161,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\"
+	-DVERSION=\"4.47\"
 
 LOCAL_SRC_FILES:= \
 	avtest.c
@@ -186,7 +186,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\"
+	-DVERSION=\"4.47\"
 
 LOCAL_SRC_FILES:= \
 	bdaddr.c
@@ -215,7 +215,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\"
+	-DVERSION=\"4.47\"
 
 LOCAL_SRC_FILES:= \
 	btiotest.c
@@ -251,7 +251,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\"
+	-DVERSION=\"4.47\"
 
 LOCAL_SRC_FILES:= \
 	hciemu.c
@@ -284,7 +284,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\"
+	-DVERSION=\"4.47\"
 
 LOCAL_SRC_FILES:= \
 	lmptest.c
@@ -309,7 +309,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\"
+	-DVERSION=\"4.47\"
 
 LOCAL_SRC_FILES:= \
 	sdptest.c
diff --git a/tools/Android.mk b/tools/Android.mk
index c3dd05a..c966a3b 100755
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -10,7 +10,7 @@
 	avinfo.c
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\"
+	-DVERSION=\"4.47\"
 
 LOCAL_C_INCLUDES:=\
 	$(LOCAL_PATH)/../include \
@@ -35,7 +35,7 @@
 	sdptool.c
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\" -fpermissive
+	-DVERSION=\"4.47\" -fpermissive
 
 LOCAL_C_INCLUDES:=\
 	$(LOCAL_PATH)/../include \
@@ -64,7 +64,7 @@
 
 LOCAL_CFLAGS:= \
 	-DSTORAGEDIR=\"/tmp\" \
-	-DVERSION=\"4.40\"
+	-DVERSION=\"4.47\"
 
 LOCAL_C_INCLUDES:=\
 	$(LOCAL_PATH)/../include \
@@ -93,7 +93,7 @@
 
 LOCAL_CFLAGS:= \
 	-DSTORAGEDIR=\"/tmp\" \
-	-DVERSION=\"4.40\"
+	-DVERSION=\"4.47\"
 
 LOCAL_C_INCLUDES:=\
 	$(LOCAL_PATH)/../include \
@@ -146,7 +146,7 @@
 	hciattach_tialt.c
 
 LOCAL_CFLAGS:= \
-	-DVERSION=\"4.40\" \
+	-DVERSION=\"4.47\" \
 	-D__BSD_VISIBLE=1
 
 LOCAL_C_INCLUDES:=\