diff --git a/Makefile.am b/Makefile.am
index 488a3f9..b91d979 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,18 +111,6 @@ builtin_nodist =
 
 include Makefile.plugins
 
-if EXPERIMENTAL
-builtin_modules += sap
-builtin_sources += profiles/sap/main.c profiles/sap/manager.h \
-			profiles/sap/manager.c profiles/sap/server.h \
-			profiles/sap/server.c profiles/sap/sap.h \
-			profiles/sap/sap-dummy.c
-
-noinst_LIBRARIES += profiles/sap/libsap.a
-
-profiles_sap_libsap_a_SOURCES = profiles/sap/sap.h profiles/sap/sap-u8500.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
index a4442f3..bdd5d59 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -20,6 +20,15 @@ builtin_sources += plugins/dbusoob.c
 
 builtin_modules += neard
 builtin_sources += plugins/neard.c
+
+builtin_modules += sap
+builtin_sources += profiles/sap/main.c profiles/sap/manager.h \
+			profiles/sap/manager.c profiles/sap/server.h \
+			profiles/sap/server.c profiles/sap/sap.h \
+			profiles/sap/sap-dummy.c
+
+noinst_LIBRARIES += profiles/sap/libsap.a
+profiles_sap_libsap_a_SOURCES = profiles/sap/sap.h profiles/sap/sap-u8500.c
 endif
 
 builtin_modules += audio