diff -urN xfig.3.2.5-alpha4.org/Fig.ad xfig.3.2.5-alpha4/Fig.ad
--- xfig.3.2.5-alpha4.org/Fig.ad	2004-04-22 00:49:19.465831480 +0200
+++ xfig.3.2.5-alpha4/Fig.ad	2004-04-22 01:00:31.335691736 +0200
@@ -24,7 +24,7 @@
 
 ! pdfviewer - put your favorite pdf viewer here.  
 !		This is for viewing the xfig how-to guide and man pages
-Fig.pdfviewer:			acroread %f
+Fig.pdfviewer:			xpdf %f
 
 ! Spell check program - put your favorite spelling check program here.
 !		It must write the misspelled words to standard output.
diff -urN xfig.3.2.5-alpha4.org/Imakefile xfig.3.2.5-alpha4/Imakefile
--- xfig.3.2.5-alpha4.org/Imakefile	2004-04-22 00:49:18.756939248 +0200
+++ xfig.3.2.5-alpha4/Imakefile	2004-04-22 01:01:06.072410952 +0200
@@ -58,7 +58,7 @@
 
 #ifdef XAW3D1_5E
 DUSEXAW3D = -DXAW3D -DXAW3D1_5E
-XAWLIB = -lXaw3d15e
+XAWLIB = -lXaw3d
 #else
 #ifdef XAW3D
 DUSEXAW3D = -DXAW3D
@@ -72,7 +72,7 @@
 XCOMM are in different places
 
 PNGLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/local/include
+PNGINC = 
 ZLIBDIR = $(USRLIBDIR)
 
 XCOMM If don't want JPEG support, comment out the #define USEJPEG line
@@ -92,8 +92,8 @@
 
 #ifdef USEJPEG
 #ifdef USEINSTALLEDJPEG
-JPEGLIBDIR = /usr/local/lib
-JPEGINC = -I/usr/include/X11
+JPEGLIBDIR = /usr/lib
+JPEGINC =
 #else
 JPEGLIBDIR = ../jpeg
 JPEGINC = -I$(JPEGLIBDIR)
@@ -116,7 +116,7 @@
 
 #ifdef USEXPM
 XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I/usr/include/X11
+XPMINC = -I/usr/X11R6/include/X11
 #endif
 
 XCOMM Uncomment the following definiton if you want to use the small icons
@@ -157,7 +157,7 @@
 XCOMM inline functions. With the "INLINE" keyword, you should notice that
 XCOMM the display will be a bit faster in complex figures
 
-XCOMM USEINLINE = -DUSE_INLINE
+USEINLINE = -DUSE_INLINE
 
 XCOMM use (and change) the following if you want the multi-key data base file
 XCOMM somewhere other than the standard X11 library directory
@@ -239,7 +239,7 @@
 #endif /* USEJPEG */
 
 #ifdef I18N
-I18N_DEFS = -DI18N -DSETLOCALE
+I18N_DEFS = -DI18N
 I18N_SRC = w_i18n.c
 I18N_OBJ = w_i18n.o
 #endif