diff --git a/Makefile.am b/Makefile.am
index d7ec198..3dfba68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ SUBDIRS = doc m4 po src
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = config/config.rpath config/mkinstalldirs configure.ac
+EXTRA_DIST = config/config.rpath config/mkinstalldirs configure.ac gettext.h
 
 apidox :
 	$(MAKE) -C $(top_builddir)/doc apidox
diff --git a/doc/Makefile.am b/doc/Makefile.am
index aabf3d0..ce8d3f1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -32,4 +32,8 @@ if HAVE_DOXYGEN
 	doxygen @top_builddir@/config/Doxyfile
 else
 	@echo "** Doxygen not installed. Skipping generating API docs."
+	test ! -d '$(builddir)/API' && mkdir $(builddir)/API
 endif
+
+EXTRA_DIST = API
+API : apidox
diff --git a/m4/Makefile.am b/m4/Makefile.am
index e616c88..9df10eb 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -27,4 +27,4 @@ noinst_DATA = compilerflags.m4 \
 		ac_pkg_swig.m4 \
 		ac_python_module.m4
 
-EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4
+EXTRA_DIST = $(noinst_DATA)