diff --git a/meta/packages/bluez/bluez4.inc b/meta/packages/bluez/bluez4.inc
new file mode 100644
index 0000000000..4afb0fd8fa
--- /dev/null
+++ b/meta/packages/bluez/bluez4.inc
@@ -0,0 +1,41 @@
+DESCRIPTION = "BlueZ - Bluetooth protocol stack for Linux"
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "gstreamer gst-plugins-base libusb dbus"
+PROVIDES = "bluez-utils-dbus"
+RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
+RREPLACES_${PN} = "bluez-utils-dbus"
+RCONFLICTS_${PN} = "bluez-utils-nodbus"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz"
+
+S = "${WORKDIR}/bluez-${PV}"
+
+inherit autotools update-rc.d pkgconfig
+
+INITSCRIPT_NAME = "bluetooth"
+INITSCRIPT_PARAMS = "defaults 23 19"
+
+do_install_append() {
+	install -d ${D}${base_sbindir} ${D}${base_bindir}/
+	echo base_sbindir is:   ${D}${base_sbindir}	
+	mv ${D}${sbindir}/* ${D}${base_sbindir}/
+	mv ${D}${bindir}/* ${D}${base_bindir}/
+	rmdir ${D}${bindir} ${D}${sbindir}
+	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
+}
+
+PACKAGES =+ "${PN}-alsa ${PN}-alsa-dev gst-plugin-bluez gst-plugin-bluez-dev ${PN}-lib ${PN}-lib-dev ${PN}-lib-dbg"
+
+FILES_${PN}-alsa = " ${libdir}/alsa-lib/*.so "
+FILES_${PN}-alsa-dev += " ${libdir}/alsa-lib/*.la "
+
+FILES_gst-plugin-bluez = "${libdir}/gstreamer-*/*.so"
+FILES_gst-plugin-bluez-dev = "${libdir}/gstreamer-*/*.la"
+FILES_${PN}-lib = "${libdir}/libbluetooth.so.*"
+FILES_${PN}-lib-dev = "${libdir}/libbluetooth.so \
+		       ${libdir}/*.la \
+                       ${includedir}/bluetooth \ 
+		       ${libdir}/pkgconfig/bluez.pc \
+                      "
diff --git a/meta/packages/bluez/bluez4_4.17.bb b/meta/packages/bluez/bluez4_4.17.bb
new file mode 100644
index 0000000000..437dfe679b
--- /dev/null
+++ b/meta/packages/bluez/bluez4_4.17.bb
@@ -0,0 +1,50 @@
+require bluez4.inc
+
+DEPENDS += "glib-2.0"
+PR = "r4"
+
+PACKAGES =+ "${PN}-compat"
+
+CONFFILES_${PN} = " \
+                   ${sysconfdir}/bluetooth/main.conf \
+                  "
+
+CONFFILES_${PN}-compat = " \
+                          ${sysconfdir}/bluetooth/rfcomm.conf \
+			 "
+
+FILES_${PN} = " \
+               ${base_sbindir}/bluetoothd \
+               ${libdir}/bluetooth \
+               ${sysconfdir}/init.d/bluetooth \
+               ${sysconfdir}/bluetooth/*.service \
+               ${sysconfdir}/bluetooth/main.conf \
+               ${sysconfdir}/default \
+               ${sysconfdir}/dbus-1 \
+	       ${base_sbindir}/hciattach \
+	       ${base_sbindir}/hid2hci \
+              "
+
+FILES_${PN}-dbg += " \
+                   ${libdir}/bluetooth/.debug \
+		   ${libdir}/cups/backend/.debug \
+		   ${libdir}/alsa-lib/.debug \
+		  "
+
+FILES_${PN}-lib-dbg += " ${libdir}/bluetooth/plugins/.debug/*.so"
+
+
+FILES_${PN}-compat = " \
+                    ${base_sbindir}/bccmd \
+                    ${base_sbindir}/hciconfig \
+                    ${base_bindir}/ciptool \
+                    ${base_bindir}/dfutool \
+                    ${base_bindir}/dund \
+                    ${base_bindir}/hcitool \
+                    ${base_bindir}/hidd \
+                    ${base_bindir}/l2ping \
+                    ${base_bindir}/pand \
+                    ${base_bindir}/rfcomm \
+                    ${base_bindir}/sdptool \
+		    ${sysconfdir}/bluetooth/rfcomm.conf \
+		   "