--- BUILD/john-1.6/src/params.h.orig	1998-12-03 01:29:50.000000000 +0100
+++ BUILD/john-1.6/src/params.h	2003-04-25 20:29:54.000000000 +0200
@@ -53,9 +53,9 @@
  * File names.
  */
 #define LOG_NAME			"~/john.pot"
-#define CFG_NAME			"~/john.ini"
+#define CFG_NAME			"/etc/john.ini"
 #define RECOVERY_NAME			"~/restore"
-#define WORDLIST_NAME			"~/password.lst"
+#define WORDLIST_NAME			"/usr/share/john/password.lst"
 
 /*
  * Configuration file section names.
--- BUILD/john-1.6/src/Makefile.orig	2003-04-25 20:31:35.000000000 +0200
+++ BUILD/john-1.6/src/Makefile	2003-04-25 20:32:03.000000000 +0200
@@ -13,7 +13,7 @@
 SED = sed
 NULL = /dev/null
 CPPFLAGS = -E
-CFLAGS = -c -Wall -O2 -fomit-frame-pointer
+CFLAGS = -c -Wall $(RPM_OPT_FLAGS)
 ASFLAGS = -c
 LDFLAGS = -s
 OPT_NORMAL = -funroll-loops
@@ -115,14 +115,12 @@
 linux-x86-any-elf:
 	$(LN) x86-any.h arch.h
 	$(MAKE) $(PROJ) \
-		JOHN_OBJS="$(JOHN_OBJS) x86.o" \
-		CFLAGS="$(CFLAGS) -m486"
+		JOHN_OBJS="$(JOHN_OBJS) x86.o"
 
 linux-x86-mmx-elf:
 	$(LN) x86-mmx.h arch.h
 	$(MAKE) $(PROJ) \
-		JOHN_OBJS="$(JOHN_OBJS) x86.o" \
-		CFLAGS="$(CFLAGS) -m486"
+		JOHN_OBJS="$(JOHN_OBJS) x86.o"
 
 linux-x86-k6-elf:
 	$(LN) x86-k6.h arch.h
--- BUILD/john-1.6/run/john.ini.orig	1998-12-03 01:29:50.000000000 +0100
+++ BUILD/john-1.6/run/john.ini	2003-04-25 20:29:54.000000000 +0200
@@ -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