diff --git a/Makefile.am b/Makefile.am
index c36d601b..01dd41e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -192,8 +192,8 @@ dist-po: po/Makefile $(PO_MAIN_FILES)
 	$(am__cd) po && $(MAKE) $(AM_MAKEFLAGS) distdir="$$rel_distsubdir" distdir
 
 $(srcdir_po)/POTFILES.in: $(top_srcdir)/src/microhttpd/Makefile.am
-	@echo "cd $(top_builddir)/src/microhttpd && $(MAKE) $(AM_MAKEFLAGS) update-po-POTFILES.in" && \
-	$(am__cd) '$(top_builddir)/src/microhttpd' && $(MAKE) $(AM_MAKEFLAGS) update-po-POTFILES.in
+	@echo "cd $(top_builddir)/src/mhd2 && $(MAKE) $(AM_MAKEFLAGS) update-po-POTFILES.in" && \
+	$(am__cd) '$(top_builddir)/src/mhd2' && $(MAKE) $(AM_MAKEFLAGS) update-po-POTFILES.in
 
 AUTOPOINT = autopoint
 AUTOPOINT_FLAGS =
diff --git a/src/mhd2/Makefile.am b/src/mhd2/Makefile.am
index 339ed14f..1903ba19 100644
--- a/src/mhd2/Makefile.am
+++ b/src/mhd2/Makefile.am
@@ -176,3 +176,12 @@ $(CONFIG_HEADER): $(builddir)/../incl_priv/mhd_config.h.in $(top_srcdir)/configu
 $(builddir)/../incl_priv/mhd_config.h.in: $(top_srcdir)/configure.ac
 	@echo "cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh" && \
 	  $(am__cd) $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+update-po-POTFILES.in: $(top_srcdir)/po/POTFILES.in
+
+$(top_srcdir)/po/POTFILES.in: $(srcdir)/Makefile.am
+	@echo "Creating $@"
+	@echo  src/include/microhttpd2.h > "$@" && \
+	for src in $(am__libmicrohttpd2_la_SOURCES_DIST) ; do \
+	  echo "$(subdir)/$$src" >> "$@" ; \
+	done