diff --git a/Makefile.am b/Makefile.am
index 9afd829..d210214 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,13 @@
 include $(top_srcdir)/build-aux/guile-rules.am
 
+EXTRA_DIST +=                                   \
+  .dir-locals.el                                \
+  bootstrap                                     \
+  build-aux/git-version-gen                     \
+  build-aux/gitlab-ci.yml                       \
+  build-aux/gitlog-to-changelog                 \
+  guix.scm
+
 # Modules and scripts
 #####################
 
@@ -54,6 +62,8 @@ scripts/gash: scripts/gash.in Makefile
 	$(do_subst) < $(srcdir)/scripts/gash.in > scripts/gash
 	chmod a+x scripts/gash
 
+EXTRA_DIST += scripts/gash.in
+
 # Documentation
 ###############
 
@@ -61,6 +71,10 @@ info_TEXINFOS = doc/gash.texi
 
 gash_TEXINFOS = doc/fdl-1.3.texi
 
+EXTRA_DIST +=                                   \
+  $(gash_TEXINFOS)                              \
+  doc/syntax.txt
+
 # Tests
 #######
 
@@ -220,9 +234,110 @@ XFAIL_TESTS =                                   \
 BROKEN_TESTS =                                  \
   tests/50-redirect-merge.sh
 
+TEST_DATA_FILES =                               \
+  tests/00-exit-1.exit                          \
+  tests/00-exit-2.exit                          \
+  tests/00-exit-error.exit                      \
+  tests/00-exit-var.exit                        \
+  tests/01-script-arg-length.stdout             \
+  tests/01-script-arg-list.stdout               \
+  tests/01-script-backslash-twice.exit          \
+  tests/01-script-backslash.exit                \
+  tests/01-script-newline.exit                  \
+  tests/01-script-semi.exit                     \
+  tests/01-script-shift.stdout                  \
+  tests/03-echo-brace.stdout                    \
+  tests/03-echo-doublequotes.stdout             \
+  tests/03-echo-escaped-doublequotes.stdout     \
+  tests/03-echo-nesting.stdout                  \
+  tests/03-echo-quoted-doublequotes.stdout      \
+  tests/04-echo-equal.stdout                    \
+  tests/04-echo-word-at-word.stdout             \
+  tests/04-echo-word-at.stdout                  \
+  tests/05-assignment-backtick.stdout           \
+  tests/05-assignment-doublequoted-doublequotes.stdout \
+  tests/05-assignment-echo.stdout               \
+  tests/05-assignment-empty.stdout              \
+  tests/05-assignment-variable-word.stdout      \
+  tests/05-assignment-word-variable.stdout      \
+  tests/06-command-compound-word.stdout         \
+  tests/06-compound-word.stdout                 \
+  tests/07-variable-not-or.stdout               \
+  tests/07-variable-or-doublequote.stdout       \
+  tests/07-variable-or-empty.stdout             \
+  tests/07-variable-or-variable.stdout          \
+  tests/07-variable-or.stdout                   \
+  tests/08-variable-and.stdout                  \
+  tests/08-variable-not-and.stdout              \
+  tests/10-else.multiple.stdout                 \
+  tests/10-if-multiple.stdout                   \
+  tests/11-for-done-subshell.stdout             \
+  tests/11-for-split-sequence.stdout            \
+  tests/11-for.stdout                           \
+  tests/20-and.exit                             \
+  tests/20-pipe-exit-1.exit                     \
+  tests/20-pipe-sed-cat.stdout                  \
+  tests/20-pipe-sed.stdout                      \
+  tests/20-semi.exit                            \
+  tests/30-for-substitution.stdout              \
+  tests/30-substitution-assignment-at.stdout    \
+  tests/30-substitution-assignment.stdout       \
+  tests/30-substitution-backtick.stdout         \
+  tests/30-substitution-redirect.stdout         \
+  tests/30-substitution-word.stdout             \
+  tests/30-substitution.stdout                  \
+  tests/40-assignment-eval-echo.stdout          \
+  tests/40-eval-echo-variable.stdout            \
+  tests/40-eval.stdout                          \
+  tests/41-dot.stdout                           \
+  tests/42-export-new.stdout                    \
+  tests/42-sh-export-new.stdout                 \
+  tests/42-sh-export.stdout                     \
+  tests/42-sh.stdout                            \
+  tests/43-trap-subshell.stdout                 \
+  tests/50-iohere.stdout                        \
+  tests/50-redirect-append.stdout               \
+  tests/50-redirect-clobber.stdout              \
+  tests/50-redirect-in-out.stdout               \
+  tests/50-redirect-merge.stdout                \
+  tests/50-redirect-pipe.stdout                 \
+  tests/50-redirect-sed.stdout                  \
+  tests/50-redirect-space.stdout                \
+  tests/50-redirect.stdout                      \
+  tests/60-function-at.stdout                   \
+  tests/60-function.stdout                      \
+  tests/70-hash-hash.stdout                     \
+  tests/70-hash.stdout                          \
+  tests/70-percent-percent.stdout               \
+  tests/70-percent-space.stdout                 \
+  tests/70-percent.stdout                       \
+  tests/70-slash-string.stdout                  \
+  tests/70-slash.stdout                         \
+  tests/100-cd-foo.exit                         \
+  tests/100-cd.stdout                           \
+  tests/data/star/2                             \
+  tests/data/star/3                             \
+  tests/data/star/0                             \
+  tests/data/star/1                             \
+  tests/data/foo                                \
+  tests/data/diff.scm                           \
+  tests/data/script.sh
+
 .PHONY: test-list
 test-list: ; @echo $(TESTS)
 
+EXTRA_DIST +=                                   \
+  $(TESTS)                                      \
+  $(BROKEN_TESTS)                               \
+  $(TEST_DATA_FILES)                            \
+  test.sh                                       \
+  tests/unit/automake.scm                       \
+  tests/spec/check-spec                         \
+  tests/spec/Makefile.am                        \
+  tests/spec/Makefile.in                        \
+  tests/spec/oil.scm                            \
+  tests/bootstrap/bash-without-bash.scm
+
 # Coverage
 ##########
 
@@ -249,9 +364,6 @@ gen-ChangeLog:
 	rm -f $(distdir)/ChangeLog
 	mv $(distdir)/ChangeLog-t $(distdir)/ChangeLog
 
-EXTRA_DIST +=                                   \
-  scripts/gash.in
-
 # Cleaning
 ##########