7 files changed, 10 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac
index a76a4e6..2371b47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,10 +106,6 @@ AC_OUTPUT([Makefile
 	   src/guile/skribilo/biblio/Makefile
 	   doc/Makefile
 	   doc/user/Makefile
-	   doc/img/Makefile
-	   doc/dir/Makefile
 	   doc/modules/Makefile
-	   doc/modules/skribilo/Makefile
-	   doc/modules/skribilo/documentation/Makefile
 	   doc/man/Makefile
 	   emacs/Makefile])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a07aea0..a61c128 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1 +1,5 @@
-SUBDIRS = user modules img dir man
+SUBDIRS = user modules man
+
+EXTRA_DIST =					\
+  dir/dir.skb					\
+  img/bsd.png img/lambda.png img/linux.png
diff --git a/doc/dir/Makefile.am b/doc/dir/Makefile.am
deleted file mode 100644
index 97f6673..0000000
--- a/doc/dir/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-EXTRA_DIST = dir.skb
-
-## arch-tag: 68df7b7b-a45d-4cdc-b0b3-ef738a83965c
diff --git a/doc/img/Makefile.am b/doc/img/Makefile.am
deleted file mode 100644
index 0be3236..0000000
--- a/doc/img/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-EXTRA_DIST = bsd.png lambda.png linux.png
-
-## arch-tag: 0008e69a-4745-46d8-9da4-2173db33965d
diff --git a/doc/modules/Makefile.am b/doc/modules/Makefile.am
index 1daf926..bb28818 100644
--- a/doc/modules/Makefile.am
+++ b/doc/modules/Makefile.am
@@ -1,3 +1,5 @@
-SUBDIRS = skribilo
-
-## arch-tag: 9c90dd7b-0ee7-44b9-ab41-5283d1bf1fb9
+EXTRA_DIST =					\
+  skribilo/documentation/api.scm		\
+  skribilo/documentation/env.scm		\
+  skribilo/documentation/extension.scm		\
+  skribilo/documentation/manual.scm
diff --git a/doc/modules/skribilo/Makefile.am b/doc/modules/skribilo/Makefile.am
deleted file mode 100644
index 71e8c64..0000000
--- a/doc/modules/skribilo/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = documentation
-
-## arch-tag: af599d8d-2e67-49b3-afdf-aa2dba5a7c4a
diff --git a/doc/modules/skribilo/documentation/Makefile.am b/doc/modules/skribilo/documentation/Makefile.am
deleted file mode 100644
index 1562b0a..0000000
--- a/doc/modules/skribilo/documentation/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-EXTRA_DIST = api.scm env.scm extension.scm manual.scm
-
-## arch-tag: 171ec210-e895-42ce-b068-da10ed5c2551