diff --git a/Makefile.am b/Makefile.am
index 9789ba3..9c51a55 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 
-SUBDIRS = src include doc
+SUBDIRS = contrib src include doc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libosmo-rspro.pc
diff --git a/configure.ac b/configure.ac
index c4d9766..d2c5e58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,6 +169,9 @@
 AC_OUTPUT(
 	Makefile
 	libosmo-rspro.pc
+	contrib/Makefile
+	contrib/etc_default/Makefile
+	contrib/systemd/Makefile
 	doc/Makefile
 	doc/manuals/Makefile
 	src/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 0000000..17f56ed
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = etc_default systemd
+
+EXTRA_DIST = remsim-apitool.py owhw-event-script.sh
diff --git a/contrib/etc_default/Makefile.am b/contrib/etc_default/Makefile.am
new file mode 100644
index 0000000..49c9fe6
--- /dev/null
+++ b/contrib/etc_default/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST = osmo-remsim-bankd \
+	     osmo-remsim-client \
+	     osmo-remsim-client-0 osmo-remsim-client-1 osmo-remsim-client-2 osmo-remsim-client-3
diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
new file mode 100644
index 0000000..642920c
--- /dev/null
+++ b/contrib/systemd/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = osmo-remsim-bankd.service osmo-remsim-client@.service osmo-remsim-server.service