4 files changed, 19 insertions, 4 deletions
diff --git a/kolabd/Makefile.am b/kolabd/Makefile.am
index 60b99ef..2154b86 100644
--- a/kolabd/Makefile.am
+++ b/kolabd/Makefile.am
@@ -1,4 +1,6 @@
-EXTRA_DIST = kolabd.sysvinit
+EXTRA_DIST = \
+	kolabd.sysconfig \
+	kolabd.sysvinit
 
 kolabddir = $(pythondir)/kolabd
 kolabd_PYTHON = $(wildcard *.py)
diff --git a/pykolab.spec.in b/pykolab.spec.in
index dce8629..5eaea68 100644
--- a/pykolab.spec.in
+++ b/pykolab.spec.in
@@ -105,9 +105,14 @@ Kolab SMTP Access Policy for Postfix
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-mkdir -p %{buildroot}/%{_initddir}
+mkdir -p \
+    %{buildroot}/%{_initddir} \
+    %{buildroot}/%{_sysconfdir}/sysconfig
 
+%{__install} -p -m 644 saslauthd/kolab-saslauthd.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/kolab-saslauthd
 %{__install} -p -m 755 saslauthd/kolab-saslauthd.sysvinit %{buildroot}/%{_initddir}/kolab-saslauthd
+
+%{__install} -p -m 644 kolabd/kolabd.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/kolabd
 %{__install} -p -m 755 kolabd/kolabd.sysvinit %{buildroot}/%{_initddir}/kolabd
 
 %find_lang pykolab
@@ -218,6 +223,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING
 %{_initddir}/kolab-saslauthd
+%config(noreplace) %{_sysconfdir}/sysconfig/kolab-saslauthd
 %{_sbindir}/kolab-saslauthd
 %{python_sitelib}/saslauthd/
 %dir %{_localstatedir}/run/kolab-saslauthd
@@ -227,6 +233,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING
 %{_initddir}/kolabd
+%config(noreplace) %{_sysconfdir}/sysconfig/kolabd
 %{_sbindir}/kolabd
 %{python_sitelib}/kolabd/
 
diff --git a/pykolab/Makefile.am b/pykolab/Makefile.am
index 68d5a6a..97fdec7 100644
--- a/pykolab/Makefile.am
+++ b/pykolab/Makefile.am
@@ -11,7 +11,11 @@ pykolab_auth_ldap_PYTHON = \
 
 pykolab_clidir = $(pythondir)/$(PACKAGE)/cli
 pykolab_cli_PYTHON = \
-	cli/__init__.py
+	$(wildcard cli/*.py)
+
+pykolab_clitelemetrydir = $(pythondir)/$(PACKAGE)/cli/telemetry
+pykolab_clitelemetry_PYTHON = \
+	$(wildcard cli/telemetry/*.py)
 
 pykolab_confdir = $(pythondir)/$(PACKAGE)/conf
 pykolab_conf_PYTHON = \
diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am
index 7d5c094..1574115 100644
--- a/saslauthd/Makefile.am
+++ b/saslauthd/Makefile.am
@@ -1,4 +1,6 @@
-EXTRA_DIST = kolab-saslauthd.sysvinit
+EXTRA_DIST = \
+	kolab-saslauthd.sysconfig \
+	kolab-saslauthd.sysvinit
 
 saslauthddir = $(pythondir)/saslauthd
 saslauthd_PYTHON = $(wildcard *.py)