diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in
index 22538e27fd..051edf92ea 100644
--- a/docs/gimprc.5.in
+++ b/docs/gimprc.5.in
@@ -70,6 +70,10 @@ of 'B', 'K', 'M' or 'G' which makes GIMP interpret the size as being specified
 in bytes, kilobytes, megabytes or gigabytes. If no suffix is specified the
 size defaults to being specified in kilobytes.
 
+.TP
+
+Specifies the language to use for the user interface.  This is a string value.
+
 .TP
 (interpolation-type cubic)
 
@@ -111,6 +115,17 @@ search.
 
 This is a colon-separated list of folders to search.
 
+.TP
+(dynamics-path "${gimp_dir}/dynamics:${gimp_data_dir}/dynamics")
+
+Sets the dynamics search path.  This is a colon-separated list of folders to
+search.
+
+.TP
+(dynamics-path-writable "${gimp_dir}/dynamics")
+
+This is a colon-separated list of folders to search.
+
 .TP
 (pattern-path "${gimp_dir}/patterns:${gimp_data_dir}/patterns")
 
@@ -156,6 +171,12 @@ is a colon-separated list of folders to search.
 Specify a default brush.  The brush is searched for in the specified brush
 path.  This is a string value.
 
+.TP
+(default-dynamics "Basic Dynamics")
+
+Specify a default dynamics.  The dynamics is searched for in the specified
+dynamics path.  This is a string value.
+
 .TP
 (default-pattern "Pine")
 
@@ -182,6 +203,12 @@ Specify a default font.  This is a string value.
 When enabled, the selected brush will be used for all tools.  Possible values
 are yes and no.
 
+.TP
+(global-dynamics yes)
+
+When enabled, the selected dynamics will be used for all tools.  Possible
+values are yes and no.
+
 .TP
 (global-pattern yes)
 
@@ -571,9 +598,9 @@ large, extra-large, huge, enormous and gigantic.
 .TP
 (default-view
     (show-menubar yes)
+    (show-statusbar yes)
     (show-rulers yes)
     (show-scrollbars yes)
-    (show-statusbar yes)
     (show-selection yes)
     (show-layer-boundary yes)
     (show-guides yes)
@@ -587,9 +614,9 @@ Sets the default settings for the image view.  This is a parameter list.
 .TP
 (default-fullscreen-view
     (show-menubar yes)
+    (show-statusbar yes)
     (show-rulers yes)
     (show-scrollbars yes)
-    (show-statusbar yes)
     (show-selection yes)
     (show-layer-boundary yes)
     (show-guides yes)
@@ -653,6 +680,12 @@ to 1.0.
 There's a tradeoff between speed and quality of the zoomed-out display. 
 Possible values are low and high.
 
+.TP
+(use-event-history no)
+
+Bugs in event history buffer are frequent so in case of cursor offset problems
+turning it off helps.  Possible values are yes and no.
+
 .TP
 (default-threshold 15)
 
@@ -710,6 +743,11 @@ Save the tool options when GIMP exits.  Possible values are yes and no.
 Show a tooltip when the pointer hovers over an item.  Possible values are yes
 and no.
 
+.TP
+(single-window-mode no)
+
+Use GIMP in a single-window mode.  Possible values are yes and no.
+
 .TP
 (tearoff-menus yes)
 
diff --git a/etc/gimprc b/etc/gimprc
index ee3bd15da6..2fc5a299d1 100644
--- a/etc/gimprc
+++ b/etc/gimprc
@@ -44,6 +44,11 @@
 # 
 # (tile-cache-size 1024M)
 
+# Specifies the language to use for the user interface.  This is a string
+# value.
+# 
+# 
+
 # Sets the level of interpolation used for scaling and other transformations.
 #  Possible values are none, linear, cubic and lanczos.
 # 
@@ -78,6 +83,15 @@
 # 
 # (brush-path-writable "${gimp_dir}/brushes")
 
+# Sets the dynamics search path.  This is a colon-separated list of folders
+# to search.
+# 
+# (dynamics-path "${gimp_dir}/dynamics:${gimp_data_dir}/dynamics")
+
+# This is a colon-separated list of folders to search.
+# 
+# (dynamics-path-writable "${gimp_dir}/dynamics")
+
 # Sets the pattern search path.  This is a colon-separated list of folders to
 # search.
 # 
@@ -115,6 +129,11 @@
 # 
 # (default-brush "Round Fuzzy")
 
+# Specify a default dynamics.  The dynamics is searched for in the specified
+# dynamics path.  This is a string value.
+# 
+# (default-dynamics "Basic Dynamics")
+
 # Specify a default pattern.  This is a string value.
 # 
 # (default-pattern "Pine")
@@ -136,6 +155,11 @@
 # 
 # (global-brush yes)
 
+# When enabled, the selected dynamics will be used for all tools.  Possible
+# values are yes and no.
+# 
+# (global-dynamics yes)
+
 # When enabled, the selected pattern will be used for all tools.  Possible
 # values are yes and no.
 # 
@@ -435,9 +459,9 @@
 # 
 # (default-view
 #     (show-menubar yes)
+#     (show-statusbar yes)
 #     (show-rulers yes)
 #     (show-scrollbars yes)
-#     (show-statusbar yes)
 #     (show-selection yes)
 #     (show-layer-boundary yes)
 #     (show-guides yes)
@@ -451,9 +475,9 @@
 # 
 # (default-fullscreen-view
 #     (show-menubar yes)
+#     (show-statusbar yes)
 #     (show-rulers yes)
 #     (show-scrollbars yes)
-#     (show-statusbar yes)
 #     (show-selection yes)
 #     (show-layer-boundary yes)
 #     (show-guides yes)
@@ -506,6 +530,11 @@
 # 
 # (zoom-quality high)
 
+# Bugs in event history buffer are frequent so in case of cursor offset
+# problems turning it off helps.  Possible values are yes and no.
+# 
+# (use-event-history no)
+
 # 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
@@ -554,6 +583,10 @@
 # 
 # (show-tooltips yes)
 
+# Use GIMP in a single-window mode.  Possible values are yes and no.
+# 
+# (single-window-mode no)
+
 # When enabled, menus can be torn off.  Possible values are yes and no.
 # 
 # (tearoff-menus yes)