diff --git a/contrib/gana b/contrib/gana
index a92cff199..bf9c1300e 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit a92cff199209cbe850a2a0dc39f11a4a342c33b2
+Subproject commit bf9c1300eb2d35215ccfce6be73a51a6475d917e
diff --git a/debian/libtalerexchange.install b/debian/libtalerexchange.install
index 839f5e7d9..35961e827 100644
--- a/debian/libtalerexchange.install
+++ b/debian/libtalerexchange.install
@@ -1,7 +1,9 @@
-usr/bin/taler-config
 usr/lib/*/libtaler*.so.*
+
+# FIXME:  All this should eventually go into taler-base.
 usr/share/taler/config.d/paths.conf
 usr/share/taler/config.d/taler.conf
 debian/etc-libtalerexchange/* etc/
+usr/bin/taler-config
 usr/share/man/man5/taler.conf.5
 usr/share/man/man1/taler-config*
diff --git a/doc/Makefile.am b/doc/Makefile.am
index caa8f8940..1f22d8937 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = . doxygen
 
 man_MANS = \
   prebuilt/man/taler.conf.5            \
-  prebuilt/man/taler-config-generate.1     \
+  prebuilt/man/taler-config.1            \
   prebuilt/man/taler-auditor.1             \
   prebuilt/man/taler-auditor-dbinit.1      \
   prebuilt/man/taler-auditor-exchange.1     \