diff --git a/Makefile.am b/Makefile.am
index 0d2ba9f6..c2bd4a4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -408,6 +408,7 @@ builtin_modules += sim900
 builtin_sources += plugins/sim900.c
 
 if BLUETOOTH
+if BLUEZ4
 builtin_modules += bluetooth
 builtin_sources += plugins/bluetooth.c plugins/bluetooth.h
 
@@ -434,6 +435,7 @@ builtin_cflags += @BLUEZ_CFLAGS@
 builtin_libadd += @BLUEZ_LIBS@
 endif
 endif
+endif
 
 if PROVISION
 builtin_sources += plugins/mbpi.h plugins/mbpi.c
@@ -742,6 +744,8 @@ tools_stktest_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
 endif
 endif
 
+if BLUETOOTH
+if BLUEZ4
 if DUNDEE
 sbin_PROGRAMS += dundee/dundee
 
@@ -759,7 +763,8 @@ if SYSTEMD
 systemdunit_DATA += dundee/dundee.service
 endif
 endif
-
+endif
+endif
 endif
 
 noinst_PROGRAMS += gatchat/gsmdial gatchat/test-server gatchat/test-qcdm
diff --git a/configure.ac b/configure.ac
index 450352b1..7db41982 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,14 +173,22 @@ AC_ARG_ENABLE(qmimodem, AC_HELP_STRING([--disable-qmimodem],
 AM_CONDITIONAL(QMIMODEM, test "${enable_qmimodem}" != "no")
 
 AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--disable-bluetooth],
-				[disable Bluetooth modem support]),
+				[disable BlueZ 4 and BlueZ 5 plugins support]),
 					[enable_bluetooth=${enableval}])
-if (test "${enable_bluetooth}" != "no"); then
-	PKG_CHECK_MODULES(BLUEZ, bluez >= 4.99, dummy=yes,
-			AC_MSG_ERROR(Bluetooth library >= 4.99 is required))
+
+AC_ARG_ENABLE(bluez4, AC_HELP_STRING([--enable-bluez4],
+				[enable BlueZ 4 plugins support prior to BlueZ 5]),
+					[enable_bluez4=${enableval}])
+
+if (test "${enable_bluez4}" = "yes"); then
+	PKG_CHECK_MODULES(BLUEZ, bluez >= 4.99 bluez < 5,
+			  enable_bluez4=yes,
+			  AC_MSG_ERROR(Bluetooth library >= 4.99 and < 5 is required))
+	AC_SUBST(BLUEZ_CFLAGS)
+	AC_SUBST(BLUEZ_LIBS)
 fi
-AC_SUBST(BLUEZ_CFLAGS)
-AC_SUBST(BLUEZ_LIBS)
+
+AM_CONDITIONAL(BLUEZ4, test "${enable_bluetooth}" != "no" && test "${enable_bluez4}" = "yes")
 AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" != "no")
 
 AC_ARG_WITH([provisiondb], AC_HELP_STRING([--with-provisiondb=FILE],