diff --git a/Makefile.am b/Makefile.am
index 3e15f757..5bc3cef9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -123,13 +123,13 @@ dist-hook:
 
 LANG_CODES = de es fr it ja ko pl pt ro ru sv uk zh
 
-LIST_D = snapraid.d snapraid_log.d $(patsubst %, snapraid-%.d, $(LANG_CODES))
+LIST_D = doc/snapraid.d doc/snapraid_log.d $(patsubst %, doc/snapraid-%.d, $(LANG_CODES))
 
-LIST_MAN = man/snapraid.1 man/snapraid_log.1 $(patsubst %, man/%/snapraid.1, $(LANG_CODES))
+LIST_MAN = doc/snapraid.1 doc/snapraid_log.1 $(patsubst %, doc/snapraid-%.1, $(LANG_CODES))
 
-LIST_TXT = snapraid.txt snapraid_log.txt $(patsubst %, snapraid-%.txt, $(LANG_CODES))
+LIST_TXT = doc/snapraid.txt doc/snapraid_log.txt $(patsubst %, doc/snapraid-%.txt, $(LANG_CODES))
 
-LIST_HH = snapraid.hh snapraid_log.hh $(patsubst %, snapraid-%.hh, $(LANG_CODES))
+LIST_HH = doc/snapraid.hh doc/snapraid_log.hh $(patsubst %, doc/snapraid-%.hh, $(LANG_CODES))
 
 EXTRA_DIST = \
 	autogen.sh autover.sh \
@@ -158,7 +158,7 @@ EXTRA_DIST = \
 	raid/test/speedtest.c \
 	raid/test/invtest.c
 
-man1_MANS = man/snapraid.1 man/snapraid_log.1
+man1_MANS = doc/snapraid.1 doc/snapraid_log.1
 
 clean-local:
 	rm -f valgrind.log callgrind.log cachegrind.log
@@ -179,7 +179,7 @@ maintainer-clean-local:
 install-data-hook:
 	for lang in $(LANG_CODES); do \
 		mkdir -p $(DESTDIR)$(mandir)/$$lang/man1; \
-		$(INSTALL_DATA) $(srcdir)/man/$$lang/snapraid.1 $(DESTDIR)$(mandir)/$$lang/man1; \
+		$(INSTALL_DATA) $(srcdir)/doc/snapraid-$$lang.1 $(DESTDIR)$(mandir)/$$lang/man1/snapraid.1; \
 	done
 
 # Uninstall localized manpages
@@ -1037,48 +1037,9 @@ lcov_html:
 
 # Rules for documentation
 if HAVE_ADVD2
-man/%.1 : %.d
+%.1 : %.d
 	advd2 man < $(srcdir)/$< > $@
 
-man/de/snapraid.1: $(srcdir)/snapraid-de.d
-	advd2 man < $< > $@
-
-man/es/snapraid.1: $(srcdir)/snapraid-es.d
-	advd2 man < $< > $@
-
-man/fr/snapraid.1: $(srcdir)/snapraid-fr.d
-	advd2 man < $< > $@
-
-man/it/snapraid.1: $(srcdir)/snapraid-it.d
-	advd2 man < $< > $@
-
-man/ja/snapraid.1: $(srcdir)/snapraid-ja.d
-	advd2 man < $< > $@
-
-man/ko/snapraid.1: $(srcdir)/snapraid-ko.d
-	advd2 man < $< > $@
-
-man/pl/snapraid.1: $(srcdir)/snapraid-pl.d
-	advd2 man < $< > $@
-
-man/pt/snapraid.1: $(srcdir)/snapraid-pt.d
-	advd2 man < $< > $@
-
-man/ro/snapraid.1: $(srcdir)/snapraid-ro.d
-	advd2 man < $< > $@
-
-man/ru/snapraid.1: $(srcdir)/snapraid-ru.d
-	advd2 man < $< > $@
-
-man/sv/snapraid.1: $(srcdir)/snapraid-sv.d
-	advd2 man < $< > $@
-
-man/uk/snapraid.1: $(srcdir)/snapraid-uk.d
-	advd2 man < $< > $@
-
-man/zh/snapraid.1: $(srcdir)/snapraid-zh.d
-	advd2 man < $< > $@
-
 %.txt : %.d
 	advd2 txt < $(srcdir)/$< | todos > $@
 
diff --git a/man/de/snapraid.1 b/doc/snapraid-de.1
similarity index 100%
rename from man/de/snapraid.1
rename to doc/snapraid-de.1
diff --git a/snapraid-de.d b/doc/snapraid-de.d
similarity index 100%
rename from snapraid-de.d
rename to doc/snapraid-de.d
diff --git a/snapraid-de.txt b/doc/snapraid-de.txt
similarity index 100%
rename from snapraid-de.txt
rename to doc/snapraid-de.txt
diff --git a/man/es/snapraid.1 b/doc/snapraid-es.1
similarity index 100%
rename from man/es/snapraid.1
rename to doc/snapraid-es.1
diff --git a/snapraid-es.d b/doc/snapraid-es.d
similarity index 100%
rename from snapraid-es.d
rename to doc/snapraid-es.d
diff --git a/snapraid-es.txt b/doc/snapraid-es.txt
similarity index 100%
rename from snapraid-es.txt
rename to doc/snapraid-es.txt
diff --git a/man/fr/snapraid.1 b/doc/snapraid-fr.1
similarity index 100%
rename from man/fr/snapraid.1
rename to doc/snapraid-fr.1
diff --git a/snapraid-fr.d b/doc/snapraid-fr.d
similarity index 100%
rename from snapraid-fr.d
rename to doc/snapraid-fr.d
diff --git a/snapraid-fr.txt b/doc/snapraid-fr.txt
similarity index 100%
rename from snapraid-fr.txt
rename to doc/snapraid-fr.txt
diff --git a/man/it/snapraid.1 b/doc/snapraid-it.1
similarity index 100%
rename from man/it/snapraid.1
rename to doc/snapraid-it.1
diff --git a/snapraid-it.d b/doc/snapraid-it.d
similarity index 100%
rename from snapraid-it.d
rename to doc/snapraid-it.d
diff --git a/snapraid-it.txt b/doc/snapraid-it.txt
similarity index 100%
rename from snapraid-it.txt
rename to doc/snapraid-it.txt
diff --git a/man/ja/snapraid.1 b/doc/snapraid-ja.1
similarity index 100%
rename from man/ja/snapraid.1
rename to doc/snapraid-ja.1
diff --git a/snapraid-ja.d b/doc/snapraid-ja.d
similarity index 100%
rename from snapraid-ja.d
rename to doc/snapraid-ja.d
diff --git a/snapraid-ja.txt b/doc/snapraid-ja.txt
similarity index 100%
rename from snapraid-ja.txt
rename to doc/snapraid-ja.txt
diff --git a/man/ko/snapraid.1 b/doc/snapraid-ko.1
similarity index 100%
rename from man/ko/snapraid.1
rename to doc/snapraid-ko.1
diff --git a/snapraid-ko.d b/doc/snapraid-ko.d
similarity index 100%
rename from snapraid-ko.d
rename to doc/snapraid-ko.d
diff --git a/snapraid-ko.txt b/doc/snapraid-ko.txt
similarity index 100%
rename from snapraid-ko.txt
rename to doc/snapraid-ko.txt
diff --git a/man/pl/snapraid.1 b/doc/snapraid-pl.1
similarity index 100%
rename from man/pl/snapraid.1
rename to doc/snapraid-pl.1
diff --git a/snapraid-pl.d b/doc/snapraid-pl.d
similarity index 100%
rename from snapraid-pl.d
rename to doc/snapraid-pl.d
diff --git a/snapraid-pl.txt b/doc/snapraid-pl.txt
similarity index 100%
rename from snapraid-pl.txt
rename to doc/snapraid-pl.txt
diff --git a/man/pt/snapraid.1 b/doc/snapraid-pt.1
similarity index 100%
rename from man/pt/snapraid.1
rename to doc/snapraid-pt.1
diff --git a/snapraid-pt.d b/doc/snapraid-pt.d
similarity index 100%
rename from snapraid-pt.d
rename to doc/snapraid-pt.d
diff --git a/snapraid-pt.txt b/doc/snapraid-pt.txt
similarity index 100%
rename from snapraid-pt.txt
rename to doc/snapraid-pt.txt
diff --git a/man/ro/snapraid.1 b/doc/snapraid-ro.1
similarity index 100%
rename from man/ro/snapraid.1
rename to doc/snapraid-ro.1
diff --git a/snapraid-ro.d b/doc/snapraid-ro.d
similarity index 100%
rename from snapraid-ro.d
rename to doc/snapraid-ro.d
diff --git a/snapraid-ro.txt b/doc/snapraid-ro.txt
similarity index 100%
rename from snapraid-ro.txt
rename to doc/snapraid-ro.txt
diff --git a/man/ru/snapraid.1 b/doc/snapraid-ru.1
similarity index 100%
rename from man/ru/snapraid.1
rename to doc/snapraid-ru.1
diff --git a/snapraid-ru.d b/doc/snapraid-ru.d
similarity index 100%
rename from snapraid-ru.d
rename to doc/snapraid-ru.d
diff --git a/snapraid-ru.txt b/doc/snapraid-ru.txt
similarity index 100%
rename from snapraid-ru.txt
rename to doc/snapraid-ru.txt
diff --git a/man/sv/snapraid.1 b/doc/snapraid-sv.1
similarity index 100%
rename from man/sv/snapraid.1
rename to doc/snapraid-sv.1
diff --git a/snapraid-sv.d b/doc/snapraid-sv.d
similarity index 100%
rename from snapraid-sv.d
rename to doc/snapraid-sv.d
diff --git a/snapraid-sv.txt b/doc/snapraid-sv.txt
similarity index 100%
rename from snapraid-sv.txt
rename to doc/snapraid-sv.txt
diff --git a/man/uk/snapraid.1 b/doc/snapraid-uk.1
similarity index 100%
rename from man/uk/snapraid.1
rename to doc/snapraid-uk.1
diff --git a/snapraid-uk.d b/doc/snapraid-uk.d
similarity index 100%
rename from snapraid-uk.d
rename to doc/snapraid-uk.d
diff --git a/snapraid-uk.txt b/doc/snapraid-uk.txt
similarity index 100%
rename from snapraid-uk.txt
rename to doc/snapraid-uk.txt
diff --git a/man/zh/snapraid.1 b/doc/snapraid-zh.1
similarity index 100%
rename from man/zh/snapraid.1
rename to doc/snapraid-zh.1
diff --git a/snapraid-zh.d b/doc/snapraid-zh.d
similarity index 100%
rename from snapraid-zh.d
rename to doc/snapraid-zh.d
diff --git a/snapraid-zh.txt b/doc/snapraid-zh.txt
similarity index 100%
rename from snapraid-zh.txt
rename to doc/snapraid-zh.txt
diff --git a/man/snapraid.1 b/doc/snapraid.1
similarity index 100%
rename from man/snapraid.1
rename to doc/snapraid.1
diff --git a/snapraid.d b/doc/snapraid.d
similarity index 100%
rename from snapraid.d
rename to doc/snapraid.d
diff --git a/snapraid.txt b/doc/snapraid.txt
similarity index 100%
rename from snapraid.txt
rename to doc/snapraid.txt
diff --git a/man/snapraid_log.1 b/doc/snapraid_log.1
similarity index 100%
rename from man/snapraid_log.1
rename to doc/snapraid_log.1
diff --git a/snapraid_log.d b/doc/snapraid_log.d
similarity index 100%
rename from snapraid_log.d
rename to doc/snapraid_log.d
diff --git a/snapraid_log.txt b/doc/snapraid_log.txt
similarity index 100%
rename from snapraid_log.txt
rename to doc/snapraid_log.txt