diff --git a/ChangeLog b/ChangeLog
index 131405c5..79d2de2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-22  Frank Warmerdam  <warmerdam@pobox.com>
+
+	* I have applied a patch from Steffen Moeller <moeller@ebi.ac.uk> to
+	the configure script so that it now accepts the --prefix, and 
+	--exec-prefix directives. 
+
 2000-11-13  Frank Warmerdam  <warmerda@cs46980-c>
 
 	* I have made a variety of modifications in an effort to ensure the 
diff --git a/configure b/configure
index b1851408..a6b7a904 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.7 2000-09-27 16:20:40 warmerda Exp $
+#	$Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.8 2000-11-22 14:41:35 warmerda Exp $
 #
 # Tag Image File Format (TIFF) Software
 #
@@ -44,10 +44,8 @@ SRCDIR=					# dir where source is located
 #
 # Setup general configuration parameters.
 #
-DIR_BIN=/usr/local/bin			# destination for applications
-DIR_LIB=/usr/local/lib			# destination for library
-DIR_INC=/usr/local/include		# destination for include files
-DIR_HTML=/var/httpd/htdocs/tiff		# destination for HTML files
+PREFIX=/usr/local                       # root of installation 
+EPREFIX=${PREFIX}
 DIRS_LIBINC=				# dirs to search for ancillary includes
 DIR_JPEGLIB=				# dir for IJG -ljpeg
 DIR_GZLIB=				# dir for zlib -lgz
@@ -99,6 +97,8 @@ Options: [defaults in brackets after descriptions]
   --verbose		  opposite of --quiet
   --noninteractive        don't ask any questions
   --version               print the version of autoconf that created configure
+  --prefix=PREFIX         root of installation [PREFIX=/usr/local]
+  --exec-prefix=EPREFIX   root of installation [EPREFIX=PREFIX]
   --target=TARGET         configure for TARGET [TARGET=HOST]
   --srcdir=DIR            find the sources in DIR [configure dir or ..]
   --with-PARAM[=ARG]      set configuration PARAM [ARG=yes]
@@ -144,10 +144,15 @@ do
     -site=*|--site=*)		SITE="$ac_optarg";;
     -srcdir|--srcdir)		ac_prev=SRCDIR;;
     -srcdir=*|--srcdir=*)	SRCDIR="$ac_optarg";;
+    --exec-prefix)		ac_prev=EPREFIX;;
+    --exec-prefix=*)		EPREFIX="$ac_optarg" ;;
+    --prefix)			ac_prev=PREFIX;;
+    --prefix=*)			PREFIX="$ac_optarg";
+                                EPREFIX=${PREFIX} ;;
     -target|--target)		ac_prev=TARGET;;
     -target=*|--target=*)	TARGET="$ac_optarg" ;;
     -version|--version)
-	echo "This is TIFF configure $Revision: 1.7 $"
+	echo "This is TIFF configure $Revision: 1.8 $"
 	exit 0
 	;;
     -help|--help)		usage; exit 0;;
@@ -165,6 +170,11 @@ do
     esac
 done
 
+DIR_BIN=${EPREFIX}/bin		# destination for applications
+DIR_LIB=${EPREFIX}/lib		# destination for library
+DIR_INC=${PREFIX}/include		# destination for include files
+DIR_HTML=${PREFIX}/doc/libtiff		# destination for HTML files
+
 if [ -n "$ac_prev" ]; then
     bitch "configure: missing argument to --`echo $ac_prev | sed 's/_/-/g'`"
     kill -1 $$
@@ -1322,7 +1332,7 @@ if [ -z "${DIR_MAN-}" ]; then
     for i in $MANPATH; do
 	test -d $i && { DIR_MAN=$i; break; }
     done
-    test -z "$DIR_MAN" && DIR_MAN=/usr/local/man
+    test -z "$DIR_MAN" && DIR_MAN=${PREFIX}/man
 fi
 Note "Looks like manual pages go in $DIR_MAN."
 if [ -z "${MANSCHEME-}" ]; then