diff --git a/ChangeLog b/ChangeLog
index 37e0647e65..7f9d9d8301 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-29  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: bumped version number to 1.3.18.
+
+	* INSTALL: documented new option --with-gif-compression.
+
 2003-07-29  Adam D. Moss  <adam@gimp.org>
 
 	* plug-ins/common/gif.c: Trivial -- tabs-to-spaces.
@@ -8,7 +14,7 @@
 	<cameron@bloke.com> which allows a compile-time choice of the 
 	comression algorithm to be used in the gif plug-in.
 
-	* configure.in: Added --with-gif-compress flag to allow 
+	* configure.in: Added --with-gif-compression option to allow 
 	specification of compression algorithm via configure.
 
 2003-07-28  Helvetix Victorinox  <helvetix@gimp.org>
@@ -26,7 +32,6 @@
 	platforms.  Ideally, this will be refined to encompass different
 	versions of the compiler(s) supporting inline assembly code.
 
-
 2003-07-28  Henrik Brix Andersen  <brix@gimp.org>
 
 	* app/core/core-enums.h (GimpGridType): renamed
diff --git a/INSTALL b/INSTALL
index cf3238c9df..f89170ff78 100644
--- a/INSTALL
+++ b/INSTALL
@@ -96,6 +96,11 @@ recognizes. These are:
      use --without-mng to disable it expliticely. The same switch exists
      for aalib, use --without-aa if you run into problems.
 
+  --with-gif-compression=[lzw|rle|none].  Allows to tune the compression
+     algorithm used by the GIF plug-in. If you are afraid of Unisys' LZW
+     patent, you can go for simple run-length encoding or even configure
+     the plug-in to create uncompressed GIFs.
+
   --enable-gtk-doc.  This option controls whether the libgimp API
      references will be created using gtk-doc. The HTML pages are 
      included in a standard tarball, so you will only need this if you
diff --git a/configure.in b/configure.in
index 4f5aef6077..c7d4a17050 100644
--- a/configure.in
+++ b/configure.in
@@ -497,7 +497,7 @@ case "$host_os" in
 esac
 
 shmtype=auto
-AC_ARG_WITH(shm, [  --with-shm=none/sysv/auto     shared memory transport type (default=auto)], shmtype=$with_shm)
+AC_ARG_WITH(shm, [  --with-shm=none|sysv|auto     shared memory transport type (default=auto)], shmtype=$with_shm)
 
 case $shmtype in
   none|sysv) ;;
@@ -830,26 +830,6 @@ AC_SUBST(MNG)
 AC_SUBST(LIBMNG)
 
 
-############################################################
-# GIF compression: Allow builder to specify at compile time
-# which compression style she wants to use for gifs. The default
-# is LZW. The flag is --with-gif-compression=[lzw|rle|none] 
-# LZW: Unisys patented Lempel-Ziff encoding.
-# RLE: Simple runlenght encoding - produces files about twice as
-# big as the LZW compressed equivalent
-# None: Raw data.
-############################################################
-
-AC_ARG_WITH(gif-compression, 
-            [  --with-gif-compression=lzw|rle|none Default: lzw])
-
-if test x$with_gif_compression = xnone; then
-  AC_DEFINE(GIF_UN, 1, [Defined when we will use no compression for GIFs])
-elif test x$with_gif_compression = xrle; then
-  AC_DEFINE(GIF_RLE, 1, [Defined when we will use RLE to compress GIFs])
-fi
-
-
 ############################################################
 # libexif: Library to allow exif tags to be read from, and
 # saved to, jpeg files. Currently, this permits exif data to
@@ -957,6 +937,26 @@ AM_CONDITIONAL(BUILD_PRINT,
                test x$enable_print != xno && test x$have_gimp_print = xyes)
 
 
+############################################################
+# GIF compression: Allow builder to specify at compile time
+# which compression style she wants to use for GIFs.
+# LZW: Unisys patented Lempel-Ziff encoding.
+# RLE: Runlength encoding (produces files about twice as big
+#			   as the LZW compressed equivalent).
+# None: Raw data.
+############################################################
+
+AC_ARG_WITH(gif-compression, 
+            [  --with-gif-compression=lzw|rle|none     GIF compression style (default=lzw)])
+
+case x"$with_gif_compression" in
+  xnone)
+    AC_DEFINE(GIF_UN, 1, [Define to 1 for no GIF compression]) ;;
+  xrle)
+    AC_DEFINE(GIF_RLE, 1, [Define to 1 for RLE GIF compression]) ;;
+esac
+
+
 ####################
 # Check for sendmail
 ####################