diff --git a/Makefile.am b/Makefile.am
index 7a88e2bd7..b9fba8f3a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@
 SUBDIRS = src
 
-dist_man1_MANS = doc/man1/task.1
-dist_man5_MANS = doc/man5/taskrc.5 doc/man5/task-tutorial.5
+dist_man_MANS = doc/man/task.1 doc/man/taskrc.5 doc/man/task-tutorial.5
 
 docdir = $(datadir)/doc/${PACKAGE}-${VERSION}
 doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README
@@ -11,3 +10,6 @@ nobase_dist_bashscripts_DATA = scripts/bash/task_completion.sh
 
 zshscriptsdir = $(docdir)
 nobase_dist_zshscripts_DATA = scripts/zsh/_task
+
+i18ndir = $(docdir)
+nobase_dist_i18n_DATA = i18n/strings.de-DE i18n/strings.en-US i18n/strings.es-ES i18n/strings.fr-FR i18n/strings.nl-NL i18n/strings.sv-SE
diff --git a/doc/man5/task-tutorial.5 b/doc/man/task-tutorial.5
similarity index 100%
rename from doc/man5/task-tutorial.5
rename to doc/man/task-tutorial.5
diff --git a/doc/man1/task.1 b/doc/man/task.1
similarity index 100%
rename from doc/man1/task.1
rename to doc/man/task.1
diff --git a/doc/man5/taskrc.5 b/doc/man/taskrc.5
similarity index 100%
rename from doc/man5/taskrc.5
rename to doc/man/taskrc.5