diff --git a/lib/ChangeLog b/lib/ChangeLog
index d955a90df1..859117aece 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-02  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+	* Makefile.am (EXTRA_DIST): fix and cleanup, make sure
+	chkconfig.ltx is mentioned
+
 2004-06-01  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
 	* Makefile.am: include common.am, add subdir doc, remove doc
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6549f2cf40..1369e51635 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,10 +4,24 @@ DISTCLEANFILES += textclass.lst packages.lst lyxrc.defaults
 
 SUBDIRS = doc reLyX
 
-EXTRA_DIST = CREDITS chkconfig.ltx configure.cmd lyxrc.example \
-	external_templates bind clipart examples images \
-	kbd layouts lyx2lyx scripts templates tex ui encodings \
-	languages symbols configure configure.m4
+EXTRA_DIST = \
+	configure.m4 \
+	chkconfig.ltx \
+	$(pkgdata_DATA) \
+	$(pkgdata_SCRIPTS) \
+	$(bind_DATA) \
+	$(clipart_DATA) \
+	$(examples_DATA) \
+	$(images_DATA) \
+	$(imagesmath_DATA) \
+	$(kbd_DATA) \
+	$(layouts_DATA) \
+	$(lyx2lyx_DATA) \
+	$(lyx2lyx_SCRIPTS) \
+	$(scripts_SCRIPTS) \
+	$(templates_DATA) \
+	$(tex_DATA) \
+	$(ui_DATA)
 
 CHMOD = chmod