diff --git a/ChangeLog b/ChangeLog
index 96fceb8194..443254fc4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-24  Sven Neumann  <sven@gimp.org>
+            Michael Natterer  <mitch@gimp.org>
+
+	* Made 2.4.0 release.
+
 2007-10-23  Michael Natterer  <mitch@gimp.org>
 
 	* app/core/gimpdrawable-combine.c: move variable to local scope.
diff --git a/configure.in b/configure.in
index 77b56ca7fa..3fa09d4215 100644
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ m4_define([gimp_binary_age],
           [m4_eval(100 * gimp_minor_version + gimp_micro_version)])
 
 # For overriding the version string. Comment out if not needed.
-m4_define([gimp_version], [2.4.0-rc3])
+# m4_define([gimp_version], [2.4.0])
 
 # This is the X.Y used in -lgimp-X.Y
 m4_define([gimp_api_version], [2.0])
diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in
index 2c02d215af..68c3d4badb 100644
--- a/docs/gimprc.5.in
+++ b/docs/gimprc.5.in
@@ -315,6 +315,8 @@ system colors allocated for GIMP.  This is an integer value.
     (display-profile-from-gdk yes)
     (display-rendering-intent perceptual)
     (simulation-rendering-intent perceptual)
+    (simulation-gamut-check no)
+    (out-of-gamut-color (color-rgb 0.501961 0.501961 0.501961))
     (display-module "CdisplayLcms"))
 
 Defines the color management behavior.  This is a parameter list.
@@ -621,6 +623,12 @@ undrawn, try to set this to white.  The color is specified in the form
 (color-rgb red green blue) with channel values as floats in the range of 0.0
 to 1.0.
 
+.TP
+(zoom-quality high)
+
+There's a tradeoff between speed and quality of the zoomed-out display. 
+Possible values are low and high.
+
 .TP
 (default-threshold 15)
 
diff --git a/etc/gimprc b/etc/gimprc
index c11f6a13e9..8458bbfa96 100644
--- a/etc/gimprc
+++ b/etc/gimprc
@@ -254,6 +254,8 @@
 #     (display-profile-from-gdk yes)
 #     (display-rendering-intent perceptual)
 #     (simulation-rendering-intent perceptual)
+#     (simulation-gamut-check no)
+#     (out-of-gamut-color (color-rgb 0.501961 0.501961 0.501961))
 #     (display-module "CdisplayLcms"))
 
 # How to handle embedded color profiles when opening a file.  Possible values
@@ -479,6 +481,11 @@
 # 
 # (xor-color (color-rgb 0.501961 1.000000 0.501961))
 
+# There's a tradeoff between speed and quality of the zoomed-out display. 
+# Possible values are low and high.
+# 
+# (zoom-quality high)
+
 # Tools such as fuzzy-select and bucket fill find regions based on a
 # seed-fill algorithm.  The seed fill starts at the initially selected pixel
 # and progresses in all directions until the difference of pixel intensity