3 files changed, 8 insertions, 11 deletions
diff --git a/debian/libtalerexchange.install b/debian/libtalerexchange.install
index 8aa7f7c03..9bc2df9c0 100644
--- a/debian/libtalerexchange.install
+++ b/debian/libtalerexchange.install
@@ -2,5 +2,6 @@ usr/bin/taler-config
 usr/lib/*/libtaler*
 usr/share/taler/config.d/paths.conf
 usr/share/taler/config.d/taler.conf
+debian/etc/taler/taler.conf etc/taler/taler.conf
 usr/share/man/man5/taler.conf.5
 usr/share/man/man1/taler-config*
diff --git a/debian/taler-auditor.install b/debian/taler-auditor.install
index 79aa47d22..86bfbf8d9 100644
--- a/debian/taler-auditor.install
+++ b/debian/taler-auditor.install
@@ -13,6 +13,9 @@ usr/share/man/man1/taler-helper-auditor*
 usr/share/info/taler-auditor*
 usr/share/taler/config.d/auditor*
 usr/share/taler/sql/auditor/*
-debian/etc/taler/auditor* etc/taler/
-debian/auditor-conf/* etc/taler-auditor/
+
+# Configuration
+debian/etc/taler/conf.d/auditor* etc/taler/conf.d/
+debian/etc/taler/secrets/auditor* etc/taler/secrets/
+
 usr/share/taler/exchange/auditor-report.tex.j2
diff --git a/debian/taler-exchange.install b/debian/taler-exchange.install
index 5c3266967..6d7577b94 100644
--- a/debian/taler-exchange.install
+++ b/debian/taler-exchange.install
@@ -22,15 +22,8 @@ usr/share/info/taler-exchange*
 usr/share/taler/config.d/*
 
 # configuration files in /etc/taler
-debian/etc/taler/exchange-business.conf etc/taler/
-debian/etc/taler/exchange-db.conf etc/taler/
-debian/etc/taler/exchange-service-default.conf etc/taler/
-debian/etc/taler/exchange-service-wire.conf etc/taler/
-debian/etc/taler/exchange-system.conf etc/taler
-debian/etc/taler/exchange-wire-gateway.conf etc/taler/
-
-# sample config files
-debian/exchange-conf/* usr/share/taler/sample-configs/
+debian/etc/taler/conf.d/exchange* etc/taler/conf.d/
+debian/etc/taler/secrets/exchange etc/taler/secrets/
 
 usr/share/taler/exchange/pp/*/*
 usr/share/taler/exchange/tos/*/*