diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3c7636b8..36b3bbc4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -53,7 +53,7 @@ jobs:
           mv ../*.tar.* artifacts/
       - name: Extract ChangeLog entry ...
         run: |
-          awk '/-----*/{if (x == 1) exit; x=1;next}x' ChangeLog.md \
+          awk '/-----*/{if (x == 1) exit; x=1;next}x' doc/ChangeLog.md \
               |head -n -1 > release.md
           cat release.md
       - uses: ncipollo/release-action@v1
diff --git a/Makefile.am b/Makefile.am
index 3dc8a99c..9f0a7dc0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@
 ACLOCAL_AMFLAGS    = -I m4
 SUBDIRS            = man plugins src system tmpfiles.d
-doc_DATA           = README.md LICENSE contrib/finit.conf
-EXTRA_DIST         = README.md LICENSE ChangeLog.md contrib/finit.conf
+dist_doc_DATA      = README.md LICENSE contrib/finit.conf
 
 if CONTRIB
 SUBDIRS           += contrib
diff --git a/AUTHORS b/doc/AUTHORS
similarity index 100%
rename from AUTHORS
rename to doc/AUTHORS
diff --git a/ChangeLog.md b/doc/ChangeLog.md
similarity index 100%
rename from ChangeLog.md
rename to doc/ChangeLog.md
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f445f030..a649398e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,6 @@
 SUBDIRS         = config
+EXTRA_DIST      = AUTHORS ChangeLog.md
+
 docsdir        := @docdir@/doc
 dist_docs_DATA  = build.md cmdline.md commands.md conditions.md 	\
 		  distro.md example.md features.md index.md initctl.md	\