diff -Naur openafs-1.4.2-lunar/acinclude.m4 openafs-1.4.2/acinclude.m4
--- openafs-1.4.2-lunar/acinclude.m4	2006-10-06 16:57:11.000000000 +0200
+++ openafs-1.4.2/acinclude.m4	2006-11-21 10:02:13.000000000 +0100
@@ -1111,8 +1111,8 @@
     afsbackupdir=${afsbackupdir=/usr/afs/backup}
     afsbosconfigdir=${afsbosconfigdir=/usr/afs/local}
 else 
-    afsconfdir=${afsconfdir='${sysconfdir}/openafs/server'}
-    viceetcdir=${viceetcdir='${sysconfdir}/openafs'}
+    afsconfdir=${afsconfdir='${sysconfdir}/server'}
+    viceetcdir=${viceetcdir='${sysconfdir}'}
     afskerneldir=${afskerneldir='${libdir}/openafs'}
     afssrvbindir=${afssrvbindir='${bindir}'}
     afssrvsbindir=${afssrvsbindir='${sbindir}'}
diff -Naur openafs-1.4.2-lunar/src/afsd/Makefile.in openafs-1.4.2/src/afsd/Makefile.in
--- openafs-1.4.2-lunar/src/afsd/Makefile.in	2006-03-09 07:41:34.000000000 +0100
+++ openafs-1.4.2/src/afsd/Makefile.in	2006-11-21 10:04:49.000000000 +0100
@@ -6,6 +6,7 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
+afsddir=@sysconfdir@
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 
@@ -41,9 +42,9 @@
 system: install
 
 # XXX-INST: where to put the rc scripts?
-install: ${DESTDIR}${sbindir}/afsd ${DESTDIR}${sbindir}/vsys
+install: ${DESTDIR}${afsddir}/afsd ${DESTDIR}${sbindir}/vsys
 
-${DESTDIR}${sbindir}/afsd: afsd
+${DESTDIR}${afsddir}/afsd: afsd
 	${INSTALL} $? $@
 
 ${DESTDIR}${sbindir}/vsys: vsys
diff -Naur openafs-1.4.2-lunar/src/pam/Makefile.in openafs-1.4.2/src/pam/Makefile.in
--- openafs-1.4.2-lunar/src/pam/Makefile.in	2005-05-30 05:37:48.000000000 +0200
+++ openafs-1.4.2/src/pam/Makefile.in	2006-11-21 10:07:08.000000000 +0100
@@ -5,6 +5,7 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
+pamlibdir=/lib/security
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 
@@ -104,7 +105,7 @@
 		echo No link line for system $(SYS_NAME). ;; \
 	esac
 
-install:  ${DESTDIR}${libdir}/pam_afs.so.1 ${DESTDIR}${libdir}/pam_afs.krb.so.1
+install:  ${DESTDIR}${pamlibdir}/pam_afs.so.1 ${DESTDIR}${pamlibdir}/pam_afs.krb.so.1
 
 ${DEST}/lib/pam_afs.so.1: pam_afs.so.1
 	${INSTALL} $? $@
@@ -123,13 +124,13 @@
 
 include ../config/Makefile.version
 
-${DESTDIR}${libdir}/pam_afs.so.1: pam_afs.so.1
+${DESTDIR}${pamlibdir}/pam_afs.so.1: pam_afs.so.1
 	${INSTALL} $? $@
 
 ${TOP_LIBDIR}/pam_afs.so.1: pam_afs.so.1
 	${INSTALL} $? $@
 
-${DESTDIR}${libdir}/pam_afs.krb.so.1: pam_afs.krb.so.1
+${DESTDIR}${pamlibdir}/pam_afs.krb.so.1: pam_afs.krb.so.1
 	${INSTALL} $? $@
 
 ${TOP_LIBDIR}/pam_afs.krb.so.1: pam_afs.krb.so.1