diff --git a/Makefile.am b/Makefile.am
index 11f7468..d49e8a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -185,7 +185,6 @@ builtin_sources += profiles/health/hdp_main.c profiles/health/hdp_types.h \
 		profiles/health/hdp_util.h profiles/health/hdp_util.c
 endif
 
-if GATTMODULES
 builtin_modules += thermometer alert time gatt_example proximity deviceinfo \
 			gatt scanparam heartrate
 builtin_sources += profiles/thermometer/main.c \
@@ -228,7 +227,6 @@ builtin_sources += profiles/thermometer/main.c \
 			profiles/heartrate/heartrate.c \
 			profiles/heartrate/heartrate.h
 
-endif
 
 builtin_modules += formfactor
 builtin_sources += plugins/formfactor.c
diff --git a/acinclude.m4 b/acinclude.m4
index 0694429..7984a0b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -171,7 +171,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 	hog_suspend_driver=dummy
 	dbusoob_enable=no
 	wiimote_enable=no
-	gatt_enable=no
 	neard_enable=no
 
 	AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], [disable code optimization]), [
@@ -275,10 +274,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 
 	AC_SUBST([HOG_SUSPEND_DRIVER], [suspend-${hog_suspend_driver}.c])
 
-	AC_ARG_ENABLE(gatt, AC_HELP_STRING([--enable-gatt], [enable gatt module]), [
-		gatt_enable=${enableval}
-	])
-
 	AC_ARG_ENABLE(neard, AC_HELP_STRING([--enable-neard], [compile with neard plugin]), [
 		neard_enable=${enableval}
 	])
@@ -330,7 +325,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 	AM_CONDITIONAL(DATAFILES, test "${datafiles_enable}" = "yes")
 	AM_CONDITIONAL(DBUSOOBPLUGIN, test "${dbusoob_enable}" = "yes")
 	AM_CONDITIONAL(WIIMOTEPLUGIN, test "${wiimote_enable}" = "yes")
-	AM_CONDITIONAL(GATTMODULES, test "${gatt_enable}" = "yes")
-	AM_CONDITIONAL(HOGPLUGIN, test "${gatt_enable}" = "yes" && test "${input_enable}" = "yes")
+	AM_CONDITIONAL(HOGPLUGIN, test "${input_enable}" = "yes")
 	AM_CONDITIONAL(NEARDPLUGIN, test "${neard_enable}" = "yes")
 ])
diff --git a/bootstrap-configure b/bootstrap-configure
index c02c246..9cc78c2 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -28,5 +28,4 @@ fi
 		--enable-sap \
 		--enable-wiimote \
 		--disable-pcmcia \
-		--enable-gatt \
 		--disable-datafiles $*