diff --git a/ChangeLog b/ChangeLog
index 28bae5efb2..33b90fa58c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-24  Sven Neumann  <sven@gimp.org>
+
+	* Made 2.3.16 development release.
+
 2007-04-24  Sven Neumann  <sven@gimp.org>
 
 	* app/config/Makefile.am: fiddle with test_config_LDFLAGS to make
diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in
index daf8226a36..4e9821e9a4 100644
--- a/docs/gimprc.5.in
+++ b/docs/gimprc.5.in
@@ -613,6 +613,15 @@ receives the focus. This is useful for window managers using "click to focus".
 What to do when the space bar is pressed in the image window.  Possible values
 are none, pan and move.
 
+.TP
+(xor-color (color-rgb 0.501961 1.000000 0.501961))
+
+Sets the color that is used for XOR drawing. This setting only exists as a
+workaround for buggy display drivers. If lines on the canvas are not correctly
+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
 (default-threshold 15)
 
diff --git a/etc/gimprc b/etc/gimprc
index d9f63fd2db..e4439d8991 100644
--- a/etc/gimprc
+++ b/etc/gimprc
@@ -472,6 +472,14 @@
 # 
 # (space-bar-action pan)
 
+# Sets the color that is used for XOR drawing. This setting only exists as a
+# workaround for buggy display drivers. If lines on the canvas are not
+# correctly 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.
+# 
+# (xor-color (color-rgb 0.501961 1.000000 0.501961))
+
 # 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