diff -ruN john-1.6.orig/run/john.ini john-1.6/run/john.ini
--- john-1.6.orig/run/john.ini	1998-12-03 01:29:50.000000000 +0100
+++ john-1.6/run/john.ini	2003-03-23 14:25:28.000000000 +0100
@@ -5,7 +5,7 @@
 
 [Options]
 # Wordlist file name, to be used in batch mode
-Wordfile = ~/password.lst
+Wordfile = /usr/share/john/password.lst
 # Use idle cycles only
 Idle = N
 # Crash recovery file saving delay in seconds
@@ -314,25 +314,25 @@
 
 # Incremental modes
 [Incremental:All]
-File = ~/all.chr
+File = /usr/share/john/all.chr
 MinLen = 0
 MaxLen = 8
 CharCount = 95
 
 [Incremental:Alpha]
-File = ~/alpha.chr
+File = /usr/share/john/alpha.chr
 MinLen = 1
 MaxLen = 8
 CharCount = 26
 
 [Incremental:Digits]
-File = ~/digits.chr
+File = /usr/share/john/digits.chr
 MinLen = 1
 MaxLen = 8
 CharCount = 10
 
 [Incremental:LanMan]
-File = ~/lanman.chr
+File = /usr/share/john/lanman.chr
 MinLen = 0
 MaxLen = 7
 CharCount = 69
diff -ruN john-1.6.orig/run/mailer john-1.6/run/mailer
--- john-1.6.orig/run/mailer	1998-12-03 01:29:50.000000000 +0100
+++ john-1.6/run/mailer	2003-03-23 14:26:20.000000000 +0100
@@ -10,13 +10,10 @@
 fi
 
 # There's no need to mail users with these shells
-SHELLS=-,/bin/false,/dev/null,/bin/sync
-
-# Look for John in the same directory with this script
-DIR="`echo "$0" | sed 's,/[^/]*$,,'`"
+SHELLS=-,/bin/false,/dev/null,/bin/sync,/bin/true
 
 # Let's start
-$DIR/john -show "$1" -shells:$SHELLS | sed -n 's/:.*//p' |
+/usr/bin/john -show "$1" -shells:$SHELLS | sed -n 's/:.*//p' |
 (
 	SENT=0
 
diff -ruN john-1.6.orig/src/params.h john-1.6/src/params.h
--- john-1.6.orig/src/params.h	1998-12-03 01:29:50.000000000 +0100
+++ john-1.6/src/params.h	2003-03-23 14:22:24.000000000 +0100
@@ -53,9 +53,9 @@
  * File names.
  */
 #define LOG_NAME			"~/john.pot"
-#define CFG_NAME			"~/john.ini"
-#define RECOVERY_NAME			"~/restore"
-#define WORDLIST_NAME			"~/password.lst"
+#define CFG_NAME			"/usr/share/john/john.ini"
+#define RECOVERY_NAME			"~/john.restore"
+#define WORDLIST_NAME			"/usr/share/john/password.lst"
 
 /*
  * Configuration file section names.