diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am
index 68689da22..df939d3ee 100644
--- a/src/exchange/Makefile.am
+++ b/src/exchange/Makefile.am
@@ -6,7 +6,7 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-pkgcfgdir= $(pkgdatadir)/config.d/
+pkgcfgdir = $(prefix)/share/taler/config.d/
 
 pkgcfg_DATA = \
   exchange.conf
diff --git a/src/exchangedb/Makefile.am b/src/exchangedb/Makefile.am
index 914153f6f..0a7b0447c 100644
--- a/src/exchangedb/Makefile.am
+++ b/src/exchangedb/Makefile.am
@@ -6,7 +6,7 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-plugindir = $(libdir)/taler-exchange
+plugindir = $(libdir)/taler
 
 if HAVE_POSTGRESQL
 plugin_LTLIBRARIES = \
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 22e0133cd..4fce72ee9 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -33,7 +33,7 @@
  */
 static const struct GNUNET_OS_ProjectData taler_pd = {
   .libname = "libtalerutil",
-  .project_dirname = "taler-exchange",
+  .project_dirname = "taler",
   .binary_name = "taler-exchange-httpd",
   .env_varname = "TALER_PREFIX"
 };
diff --git a/src/wire/Makefile.am b/src/wire/Makefile.am
index 16ef1ded0..fd59c8eb7 100644
--- a/src/wire/Makefile.am
+++ b/src/wire/Makefile.am
@@ -6,7 +6,7 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-plugindir = $(libdir)/taler-exchange
+plugindir = $(libdir)/taler
 
 plugin_LTLIBRARIES = \
   libtaler_plugin_wire_sepa.la \