diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 6ad5c8aee..cc1cf4d7f 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -63,7 +63,7 @@ EXTRA_DIST = \
   pp/Makefile \
   pp/README \
   pp/pp-v0.rst \
-  pp/conf.py \
+  pp/conf.py.in \
   pp/locale/de/LC_MESSAGES/pp.po \
   $(rdata_DATA) \
   coverage.sh \
diff --git a/contrib/gana b/contrib/gana
index 212ee0a78..a4a6b9ba4 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 212ee0a78adc43cb5c04d6ea96ccc2fe74fed62b
+Subproject commit a4a6b9ba4b2634c56194d53e36344686d7052cef