diff --git a/Makefile.am b/Makefile.am
index 8bbe25ce..962ead9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -517,6 +517,11 @@ builtin_sources += plugins/bluez5.c plugins/bluez5.h
 builtin_modules += hfp_ag_bluez5
 builtin_sources += plugins/hfp_ag_bluez5.c plugins/bluez5.h
 endif
+
+if UPOWER
+builtin_modules += upower
+builtin_sources += plugins/upower.c
+endif
 endif
 
 if PROVISION
diff --git a/configure.ac b/configure.ac
index b8d42c8d..f6253e58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,11 @@ if (test "${enable_provision}" != "no"); then
 fi
 AM_CONDITIONAL(PROVISION, test "${enable_provision}" != "no")
 
+AC_ARG_ENABLE(upower, AC_HELP_STRING([--disable-upower],
+			[disable UPower plugin]),
+					[enable_upower=${enableval}])
+AM_CONDITIONAL(UPOWER, test "${enable_power}" != "no")
+
 AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
 			[do not install configuration and data files]),
 					[enable_datafiles=${enableval}])