diff -Naur heimdal-1.5.3/doc/apps.texi heimdal-1.5.3-lunar/doc/apps.texi
--- heimdal-1.5.3/doc/apps.texi	2012-12-09 23:06:44.000000000 +0100
+++ heimdal-1.5.3-lunar/doc/apps.texi	2013-09-12 19:57:02.074377037 +0200
@@ -207,7 +207,7 @@
 or you can extract it with kadmin
 
 @example
-kadmin> ext -k AFSKEYFILE:/usr/afs/etc/KeyFile afs@@My.CELL.NAME
+kadmin> ext -k AFSKEYFILE:/etc/openafs/server/KeyFile afs@@My.CELL.NAME
 @end example
 
 You have to make sure you have a @code{des-cbc-md5} encryption type since that
@@ -215,10 +215,10 @@
 
 @subsection How to convert a srvtab to a KeyFile
 
-You need a @file{/usr/vice/etc/ThisCell} containing the cellname of your
+You need a @file{/etc/openafs/server/ThisCell} containing the cellname of your
 AFS-cell.
 
-@file{ktutil copy krb4:/root/afs-srvtab AFSKEYFILE:/usr/afs/etc/KeyFile}.
+@file{ktutil copy krb4:/root/afs-srvtab AFSKEYFILE:/etc/openafs/server/KeyFile}.
 
 If keyfile already exists, this will add the new key in afs-srvtab to
 KeyFile.
diff -Naur heimdal-1.5.3/doc/heimdal.info heimdal-1.5.3-lunar/doc/heimdal.info
--- heimdal-1.5.3/doc/heimdal.info	2012-12-09 23:10:37.000000000 +0100
+++ heimdal-1.5.3-lunar/doc/heimdal.info	2013-09-12 19:56:04.162373799 +0200
@@ -2026,7 +2026,7 @@
 
 or you can extract it with kadmin
 
-     kadmin> ext -k AFSKEYFILE:/usr/afs/etc/KeyFile afs@My.CELL.NAME
+     kadmin> ext -k AFSKEYFILE:/etc/openafs/server/KeyFile afs@My.CELL.NAME
 
 You have to make sure you have a `des-cbc-md5' encryption type since
 that is the enctype that will be converted.
@@ -2034,10 +2034,10 @@
 5.2.3 How to convert a srvtab to a KeyFile
 ------------------------------------------
 
-You need a `/usr/vice/etc/ThisCell' containing the cellname of your
+You need a `/etc/openafs/server/ThisCell' containing the cellname of your
 AFS-cell.
 
-`ktutil copy krb4:/root/afs-srvtab AFSKEYFILE:/usr/afs/etc/KeyFile'.
+`ktutil copy krb4:/root/afs-srvtab AFSKEYFILE:/etc/openafs/server/KeyFile'.
 
 If keyfile already exists, this will add the new key in afs-srvtab to
 KeyFile.
diff -Naur heimdal-1.5.3/lib/kafs/kafs.h heimdal-1.5.3-lunar/lib/kafs/kafs.h
--- heimdal-1.5.3/lib/kafs/kafs.h	2012-12-09 23:06:44.000000000 +0100
+++ heimdal-1.5.3-lunar/lib/kafs/kafs.h	2013-09-12 19:43:39.923332184 +0200
@@ -178,7 +178,7 @@
 #endif
 
 
-#define _PATH_VICE		"/usr/vice/etc/"
+#define _PATH_VICE		"/etc/openafs/"
 #define _PATH_THISCELL 		_PATH_VICE "ThisCell"
 #define _PATH_CELLSERVDB 	_PATH_VICE "CellServDB"
 #define _PATH_THESECELLS	_PATH_VICE "TheseCells"
diff -Naur heimdal-1.5.3/lib/krb5/keytab_keyfile.c heimdal-1.5.3-lunar/lib/krb5/keytab_keyfile.c
--- heimdal-1.5.3/lib/krb5/keytab_keyfile.c	2012-12-09 23:06:44.000000000 +0100
+++ heimdal-1.5.3-lunar/lib/krb5/keytab_keyfile.c	2013-09-12 19:43:39.923332184 +0200
@@ -48,8 +48,8 @@
  *
  */
 
-#define AFS_SERVERTHISCELL "/usr/afs/etc/ThisCell"
-#define AFS_SERVERMAGICKRBCONF "/usr/afs/etc/krb.conf"
+#define AFS_SERVERTHISCELL "/etc/openafs/server/ThisCell"
+#define AFS_SERVERMAGICKRBCONF "/etc/openafs/server/krb.conf"
 
 struct akf_data {
     uint32_t num_entries;