diff --git a/Makefile.am b/Makefile.am
index 89c3fc1..ee20453 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,7 @@ builtin_modules =
 builtin_sources =
 builtin_nodist =
 
+include Makefile.plugins
 include Makefile.profiles
 
 if SAPPLUGIN
@@ -122,34 +123,6 @@ profiles_sap_libsap_a_SOURCES = profiles/sap/sap.h profiles/sap/sap-dummy.c \
 				profiles/sap/sap-u8500.c
 endif
 
-if SERVICEPLUGIN
-builtin_modules += service
-builtin_sources += plugins/service.c
-endif
-
-builtin_modules += formfactor
-builtin_sources += plugins/formfactor.c
-
-EXTRA_DIST += plugins/formfactor.c
-
-builtin_modules += adaptername
-builtin_sources += plugins/adaptername.c
-
-if WIIMOTEPLUGIN
-builtin_modules += wiimote
-builtin_sources += plugins/wiimote.c
-endif
-
-if DBUSOOBPLUGIN
-builtin_modules += dbusoob
-builtin_sources += plugins/dbusoob.c
-endif
-
-if NEARDPLUGIN
-builtin_modules += neard
-builtin_sources += plugins/neard.c
-endif
-
 if MAINTAINER_MODE
 plugin_LTLIBRARIES += plugins/external-dummy.la
 plugins_external_dummy_la_SOURCES = plugins/external-dummy.c
diff --git a/Makefile.plugins b/Makefile.plugins
new file mode 100644
index 0000000..72d4d2f
--- /dev/null
+++ b/Makefile.plugins
@@ -0,0 +1,24 @@
+
+builtin_modules += service
+builtin_sources += plugins/service.c
+
+builtin_modules += formfactor
+builtin_sources += plugins/formfactor.c
+
+builtin_modules += adaptername
+builtin_sources += plugins/adaptername.c
+
+if WIIMOTEPLUGIN
+builtin_modules += wiimote
+builtin_sources += plugins/wiimote.c
+endif
+
+if DBUSOOBPLUGIN
+builtin_modules += dbusoob
+builtin_sources += plugins/dbusoob.c
+endif
+
+if NEARDPLUGIN
+builtin_modules += neard
+builtin_sources += plugins/neard.c
+endif