diff --git a/courier-authlib/Makefile.am b/courier-authlib/Makefile.am

index a29eeec..75df4a1 100644

--- a/courier-authlib/Makefile.am

+++ b/courier-authlib/Makefile.am

@@ -121,8 +121,6 @@ install-authpgsqlrc:

 	$(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || :

 	$(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \

 		$(DESTDIR)@authpgsqlrc@.dist

-	-chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist

 uninstall-authpgsqlrc:

 	rm -f $(DESTDIR)@authpgsqlrc@.dist

@@ -154,8 +152,6 @@ install-authldaprc:

 	$(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || :

 	$(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \

 		$(DESTDIR)@authldaprc@.dist

-	-chown @mailuser@ $(DESTDIR)@authldaprc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist

 uninstall-authldaprc:

 	rm -f $(DESTDIR)@authldaprc@.dist

@@ -185,8 +181,6 @@ install-authmysqlrc:

 	$(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :

 	$(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \

 		$(DESTDIR)@authmysqlrc@.dist

-	-chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist

 uninstall-authmysqlrc:

 	rm -f $(DESTDIR)@authmysqlrc@.dist

@@ -216,8 +210,6 @@ install-authsqliterc:

 	$(mkinstalldirs) $(DESTDIR)`dirname @authsqliterc@` || :

 	$(INSTALL_DATA) -m 660 $(srcdir)/authsqliterc \

 		$(DESTDIR)@authsqliterc@.dist

-	-chown @mailuser@ $(DESTDIR)@authsqliterc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authsqliterc@.dist

 uninstall-authsqliterc:

 	rm -f $(DESTDIR)@authsqliterc@.dist

@@ -265,8 +257,6 @@ install-authdaemonrc:

 	sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp

 	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist

 	rm -f authdaemonrc.tmp

-	-chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist

 uninstall-authdaemonrc:

 	rm -f $(DESTDIR)@authdaemonrc@.dist

@@ -274,9 +264,9 @@ uninstall-authdaemonrc:

 authdaemonrc.h:

 	echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h

 	echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h

-	echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h

+	echo "#define AUTHDAEMONPID \"/var/run/courier-authdaemon.pid\"" >>authdaemonrc.h

 	echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h

-	echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h

+	echo "#define AUTHDAEMONLOCK \"/var/lock/subsys/courier-authdaemon\"" >>authdaemonrc.h

 BUILT_SOURCES += authdaemonrc.h

@@ -347,7 +337,7 @@ NEWS: NEWS.html

 	mv NEWS.tmp NEWS

 INSTALL: INSTALL.html

-	rm -f INSTALL; elinks -dump -no-references INSTALL.html >INSTALL.tmp

+	elinks -dump -no-references INSTALL.html >INSTALL.tmp

 	mv INSTALL.tmp INSTALL

 libcourierauthsasl_la_SOURCES=\

@@ -474,13 +464,9 @@ install-exec-hook:

 	$(mkinstalldirs) $(DESTDIR)$(sbindir) || :

 	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :

 	chmod 755 $(DESTDIR)$(pkglibexecdir)

-	-chown @mailuser@ $(DESTDIR)$(pkglibexecdir)

-	-chgrp @mailgroup@ $(DESTDIR)$(pkglibexecdir)

 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond

 	$(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :

 	chmod 750 $(DESTDIR)@authdaemonvar@

-	-chown @mailuser@ $(DESTDIR)@authdaemonvar@

-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@

 	test "@LIBAUTHUSERDB@" = "" && exit 0 ;\

 		$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) libs/makedat/makedatprog \

 				$(DESTDIR)$(pkglibexecdir)/makedatprog ; \

diff --git a/courier-authlib/Makefile.in b/courier-authlib/Makefile.in

index d9a19c6..8b1738c 100644

--- a/courier-authlib/Makefile.in

+++ b/courier-authlib/Makefile.in

@@ -358,7 +358,7 @@ am__v_CC_1 =

 CCLD = $(CC)

 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \

 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

-	$(AM_LDFLAGS) $(LDFLAGS) -o $@

+	-o $@ $(AM_LDFLAGS) $(LDFLAGS) 

 AM_V_CCLD = $(am__v_CCLD_@AM_V@)

 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)

 am__v_CCLD_0 = @echo "  CCLD    " $@;

@@ -1511,18 +1511,18 @@ uninstall-man3:

 	dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir)

 install-includeHEADERS: $(include_HEADERS)

 	@$(NORMAL_INSTALL)

-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \

+	@list='$(include_HEADERS)'; test -n "$(includedir)/@PACKAGE@" || list=; \

 	if test -n "$$list"; then \

-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \

-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \

+	  echo " $(mkdir_p) '$(DESTDIR)$(includedir)/@PACKAGE@'"; \

+	  $(mkdir_p) "$(DESTDIR)$(includedir)/@PACKAGE@" || exit 1; \

 	fi; \

 	for p in $$list; do \

 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

 	  echo "$$d$$p"; \

 	done | $(am__base_list) | \

 	while read files; do \

-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \

-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \

+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)/@PACKAGE@'"; \

+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)/@PACKAGE@" || exit $$?; \

 	done

 uninstall-includeHEADERS:

@@ -2125,8 +2125,6 @@ uninstall-man: uninstall-man1 uninstall-man3

 @HAVE_AUTHPGSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || :

 @HAVE_AUTHPGSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \

 @HAVE_AUTHPGSQL_TRUE@		$(DESTDIR)@authpgsqlrc@.dist

-@HAVE_AUTHPGSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist

-@HAVE_AUTHPGSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist

 @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc:

 @HAVE_AUTHPGSQL_TRUE@	rm -f $(DESTDIR)@authpgsqlrc@.dist

@@ -2144,8 +2142,6 @@ authpgsqlrc.h:

 @HAVE_LDAP_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || :

 @HAVE_LDAP_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \

 @HAVE_LDAP_TRUE@		$(DESTDIR)@authldaprc@.dist

-@HAVE_LDAP_TRUE@	-chown @mailuser@ $(DESTDIR)@authldaprc@.dist

-@HAVE_LDAP_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist

 @HAVE_LDAP_TRUE@uninstall-authldaprc:

 @HAVE_LDAP_TRUE@	rm -f $(DESTDIR)@authldaprc@.dist

@@ -2163,8 +2159,6 @@ authldaprc.h:

 @HAVE_AUTHMYSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :

 @HAVE_AUTHMYSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \

 @HAVE_AUTHMYSQL_TRUE@		$(DESTDIR)@authmysqlrc@.dist

-@HAVE_AUTHMYSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist

-@HAVE_AUTHMYSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist

 @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc:

 @HAVE_AUTHMYSQL_TRUE@	rm -f $(DESTDIR)@authmysqlrc@.dist

@@ -2182,8 +2176,6 @@ authmysqlrc.h:

 @HAVE_AUTHSQLITE_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authsqliterc@` || :

 @HAVE_AUTHSQLITE_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authsqliterc \

 @HAVE_AUTHSQLITE_TRUE@		$(DESTDIR)@authsqliterc@.dist

-@HAVE_AUTHSQLITE_TRUE@	-chown @mailuser@ $(DESTDIR)@authsqliterc@.dist

-@HAVE_AUTHSQLITE_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authsqliterc@.dist

 @HAVE_AUTHSQLITE_TRUE@uninstall-authsqliterc:

 @HAVE_AUTHSQLITE_TRUE@	rm -f $(DESTDIR)@authsqliterc@.dist

@@ -2207,8 +2199,6 @@ install-authdaemonrc:

 	sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp

 	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist

 	rm -f authdaemonrc.tmp

-	-chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist

 uninstall-authdaemonrc:

 	rm -f $(DESTDIR)@authdaemonrc@.dist

@@ -2216,9 +2206,9 @@ uninstall-authdaemonrc:

 authdaemonrc.h:

 	echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h

 	echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h

-	echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h

+	echo "#define AUTHDAEMONPID \"/var/run/courier-authdaemon.pid\"" >>authdaemonrc.h

 	echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h

-	echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h

+	echo "#define AUTHDAEMONLOCK \"/var/lock/subsys-authdaemon\"" >>authdaemonrc.h

 @HAVE_SGML_TRUE@$(GITFILES): %: %.git

 @HAVE_SGML_TRUE@	perl -p -e 's/\$$Id:[^\$$]*/\$$Id: '"`git log --pretty=format:\"%H\" -n 1 -- $<`-`date +%Y%m%d%H%M%S`/" <$< >$@.tmp

@@ -2276,13 +2266,9 @@ install-exec-hook:

 	$(mkinstalldirs) $(DESTDIR)$(sbindir) || :

 	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :

 	chmod 755 $(DESTDIR)$(pkglibexecdir)

-	-chown @mailuser@ $(DESTDIR)$(pkglibexecdir)

-	-chgrp @mailgroup@ $(DESTDIR)$(pkglibexecdir)

 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond

 	$(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :

 	chmod 750 $(DESTDIR)@authdaemonvar@

-	-chown @mailuser@ $(DESTDIR)@authdaemonvar@

-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@

 	test "@LIBAUTHUSERDB@" = "" && exit 0 ;\

 		$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) libs/makedat/makedatprog \

 				$(DESTDIR)$(pkglibexecdir)/makedatprog ; \

diff --git a/courier-authlib/configure.ac b/courier-authlib/configure.ac

index fc8d0ed..c6409f5 100644

--- a/courier-authlib/configure.ac

+++ b/courier-authlib/configure.ac

@@ -21,7 +21,7 @@ AC_PROG_CXX

 AC_PROG_CPP

 AC_PROG_INSTALL

 AC_PROG_LN_S

-AC_PROG_SYSCONFTOOL

+SYSCONFTOOL=$srcdir/sysconftool

 LT_INIT(dlopen)

 LTDL_INIT

 AC_SUBST(LTDLINCL)