--- src/Makefile.am	2007-11-21 15:28:08.443727483 +0100
+++ src/Makefile.am.new	2007-11-21 15:32:18.853184077 +0100
@@ -35,7 +35,7 @@
        -DCONFIG_DEFAULT=\"$(sysconfdir)/dspam.conf\"\
        -D_THREAD_SAFE -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D_GNU_SOURCE
 
-lib_LTLIBRARIES = libdspam.la 
+lib_LTLIBRARIES = libdspam.la
 pkglib_LTLIBRARIES =
 
 if DYNAMIC_DRIVER
@@ -61,7 +61,7 @@
 # installed for libdspam
 include_HEADERS = buffer.h config_shared.h decode.h error.h diction.h \
 	libdspam.h libdspam_objects.h nodetree.h tokenizer.h ldap_client.h \
-	storage_driver.h heap.h config.h
+	storage_driver.h heap.h config.h pref.h read_config.h
 
 # libdspam.a contans objects common for dspam and tools/* binaries
 libdspam_la_SOURCES = \
@@ -69,19 +69,20 @@
 	libdspam.c libdspam.h \
 	heap.c heap.h \
 	diction.c diction.h \
-        base64.c base64.h \
+	base64.c base64.h \
 	buffer.c buffer.h \
 	util.c util.h \
 	nodetree.c nodetree.h \
-        error.c error.h \
+	error.c error.h \
 	decode.c decode.h \
 	pref.c pref.h \
+	read_config.c read_config.h \
 	config_shared.c config_shared.h \
 	bnr.c bnr.h \
 	hash.c hash.h \
 	list.c list.h \
 	ldap_client.c ldap_client.h \
-        tokenizer.c tokenizer.h \
+	tokenizer.c tokenizer.h \
 	storage_driver.h
 
 if BUILD_NCORE
@@ -173,7 +174,7 @@
         dspam.c dspam.h \
         buffer.h \
 	storage_driver.h \
-	read_config.c read_config.h \
+	read_config.h \
 	config_api.c config_api.h \
 	daemon.c daemon.h \
 	client.c client.h \
@@ -183,14 +184,14 @@
 dspam_LDFLAGS = 
 
 dspamc_SOURCES = \
-	config.h libdspam.h language.h \
+	config.h language.h \
 	dspamc.c dspamc.h \
 	buffer.h error.h \
-	read_config.c read_config.h \
+	read_config.h \
 	client.c client.h \
 	agent_shared.c agent_shared.h 
 
-dspamc_LDADD = -lm buffer.o config_shared.o error.o pref.o nodetree.o util.o $(NETLIBS)
+dspamc_LDADD = -lm buffer.o config_shared.o error.o read_config.o pref.o nodetree.o util.o $(NETLIBS)
 dspamc_LDFLAGS = 
 
 # Failing of chgrp is expected and normal case when someone do