diff --git a/ChangeLog b/ChangeLog
index 79f8683ae1..9e2f98562d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-15  Sven Neumann  <sven@gimp.org>
+
+	* Made 2.5.1 development release.
+
 2008-06-14  Sven Neumann  <sven@gimp.org>
 
 	* INSTALL
diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in
index 029f6578e6..a2f4a919e4 100644
--- a/docs/gimprc.5.in
+++ b/docs/gimprc.5.in
@@ -782,13 +782,25 @@ Sets the browser used by the help system.  Possible values are gimp and
 web-browser.
 
 .TP
-(web-browser "xdg-open %s")
+(web-browser "firefox %s")
 
 Sets the external web browser to be used.  This can be an absolute path or the
 name of an executable to search for in the user's PATH. If the command
 contains '%s' it will be replaced with the URL, else the URL will be appended
 to the command with a space separating the two.  This is a single filename.
 
+.TP
+(user-manual-online no)
+
+When enabled, the online user manual will be used by the help system.
+Otherwise the locally installed copy is used.  Possible values are yes and no.
+
+.TP
+(user-manual-online-uri "http://docs.gimp.org/2.5")
+
+The location of the online user manual. This is used if 'user-manual-online'
+is enabled.  This is a string value.
+
 .TP
 (toolbox-window-hint utility)
 
diff --git a/etc/gimprc b/etc/gimprc
index e4915ae9b6..e281944c57 100644
--- a/etc/gimprc
+++ b/etc/gimprc
@@ -620,7 +620,18 @@
 # appended to the command with a space separating the two.  This is a single
 # filename.
 # 
-# (web-browser "xdg-open %s")
+# (web-browser "firefox %s")
+
+# When enabled, the online user manual will be used by the help system.
+# Otherwise the locally installed copy is used.  Possible values are yes and
+# no.
+# 
+# (user-manual-online no)
+
+# The location of the online user manual. This is used if
+# 'user-manual-online' is enabled.  This is a string value.
+# 
+# (user-manual-online-uri "http://docs.gimp.org/2.5")
 
 # The window type hint that is set on the toolbox. This may affect how your
 # window manager decorates and handles the toolbox window.  Possible values