diff --git a/Makefile.am b/Makefile.am
index 44f64fd672..69e17f4f0e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = common omx
+SUBDIRS = common omx config
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/config/Makefile.am b/config/Makefile.am
new file mode 100644
index 0000000000..5393b5a157
--- /dev/null
+++ b/config/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = raspberry-pi.conf
diff --git a/omx/gstomx-raspberry.conf b/config/raspberry-pi.conf
similarity index 100%
rename from omx/gstomx-raspberry.conf
rename to config/raspberry-pi.conf
diff --git a/configure.ac b/configure.ac
index 4e7d5507a2..cb75f14fe1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -271,6 +271,7 @@ Makefile
 omx/Makefile
 common/Makefile
 common/m4/Makefile
+config/Makefile
 )
 
 AC_OUTPUT