diff --git a/ChangeLog b/ChangeLog
index 687477e614..e565c16b45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Fri Sep 24 20:25:14 MEST 1999  Sven Neumann <sven@gimp.org>
+
+	* gimprc.in
+	* user_install
+	* user_install.bat
+	* app/gimprc.c
+	* app/install.c
+	* app/preferences_dialog.c: Updated the installed gimprc to reflect
+	most (still not all) of the new options. Create a directory for
+	the generated brushes in the users gimpdir. Appearantly, the brushes
+	still aren't loaded ?!?
+
 Fri Sep 24 17:09:30 1999  ape@gandalf.spacetec.no  (Asbjorn Pettersen)
 
 	* plug-ins/common/jpeg.c: 
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index be32a37ba5..af84450451 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -527,8 +527,11 @@ file_prefs_save_callback (GtkWidget *widget,
   if (thumbnail_mode != old_thumbnail_mode)
     update = g_list_append (update, "thumbnail-mode");
   if (trust_dirty_flag != old_trust_dirty_flag)
-    update = g_list_append (update, "trust-dirty-flag");
-
+    {
+      update = g_list_append (update, "trust-dirty-flag");
+      remove = g_list_append (update, "dont-trust-dirty-flag");
+    }
+  
   save_gimprc (&update, &remove);
 
   if (using_xserver_resolution)
diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c
index b433c85224..1ae0bc2571 100644
--- a/app/dialogs/user-install-dialog.c
+++ b/app/dialogs/user-install-dialog.c
@@ -172,6 +172,12 @@ install_help (InstallCallback callback)
 	    "\t\twide gimp brushes installation when searching for\n"
 	    "\t\tbrushes.\n") },
 
+    { 1, N_("generated_brushes\n") },
+    { 0, N_("\t\tThis is a subdirectory which is used to store brushes\n"
+	    "\t\tthat are created with the brush editor.  The default\n"
+	    "\t\gimprc file checks this subdirectory when searching for\n"
+	    "\t\tgenerated brushes.\n") },
+
     { 1, N_("gradients\n") },
     { 0, N_("\t\tThis is a subdirectory which can be used to store\n"
 	    "\t\tuser defined gradients.  The default gimprc file\n"
diff --git a/app/gimprc.c b/app/gimprc.c
index f5eaafe5f2..cb4e8b816e 100644
--- a/app/gimprc.c
+++ b/app/gimprc.c
@@ -112,8 +112,8 @@ char *    gradient_path = NULL;
 char *    default_gradient = NULL;
 char *    pluginrc_path = NULL;
 char *    module_path = NULL;
-int       tile_cache_size = 4194304;  /* 4 MB */
-int       marching_speed = 150;   /* 150 ms */
+int       tile_cache_size = 10485760;  /* 10 MB */
+int       marching_speed = 300;   /* 300 ms */
 double    gamma_val = 1.0;
 int       transparency_type = 1;  /* Mid-Tone Checks */
 int       perfectmouse = 0;       /* off (fast and sloppy) */
@@ -156,7 +156,7 @@ int       global_paint_options = TRUE;
 int       show_indicators = TRUE;
 int       max_new_image_size = 33554432;  /* 32 MB */
 int       thumbnail_mode = 1;
-int	  trust_dirty_flag = 0;
+int	  trust_dirty_flag = FALSE;
 
 extern char * module_db_load_inhibit;
 
@@ -306,7 +306,8 @@ static ParseFunc funcs[] =
   { "module-load-inhibit",       TT_PATH,       &module_db_load_inhibit, NULL },
   { "max-new-image-size",        TT_MEMSIZE,    &max_new_image_size, NULL },
   { "thumbnail-mode",            TT_INT,        &thumbnail_mode, NULL },
-  { "trust-dirty-flag",		 TT_INT,	&trust_dirty_flag, NULL }
+  { "trust-dirty-flag",		 TT_BOOLEAN,	&trust_dirty_flag, NULL },
+  { "dont-trust-dirty-flag",     TT_BOOLEAN,	NULL, &trust_dirty_flag }
 };
 static int nfuncs = sizeof (funcs) / sizeof (funcs[0]);
 
diff --git a/app/gui/preferences-dialog.c b/app/gui/preferences-dialog.c
index be32a37ba5..af84450451 100644
--- a/app/gui/preferences-dialog.c
+++ b/app/gui/preferences-dialog.c
@@ -527,8 +527,11 @@ file_prefs_save_callback (GtkWidget *widget,
   if (thumbnail_mode != old_thumbnail_mode)
     update = g_list_append (update, "thumbnail-mode");
   if (trust_dirty_flag != old_trust_dirty_flag)
-    update = g_list_append (update, "trust-dirty-flag");
-
+    {
+      update = g_list_append (update, "trust-dirty-flag");
+      remove = g_list_append (update, "dont-trust-dirty-flag");
+    }
+  
   save_gimprc (&update, &remove);
 
   if (using_xserver_resolution)
diff --git a/app/gui/user-install-dialog.c b/app/gui/user-install-dialog.c
index b433c85224..1ae0bc2571 100644
--- a/app/gui/user-install-dialog.c
+++ b/app/gui/user-install-dialog.c
@@ -172,6 +172,12 @@ install_help (InstallCallback callback)
 	    "\t\twide gimp brushes installation when searching for\n"
 	    "\t\tbrushes.\n") },
 
+    { 1, N_("generated_brushes\n") },
+    { 0, N_("\t\tThis is a subdirectory which is used to store brushes\n"
+	    "\t\tthat are created with the brush editor.  The default\n"
+	    "\t\gimprc file checks this subdirectory when searching for\n"
+	    "\t\tgenerated brushes.\n") },
+
     { 1, N_("gradients\n") },
     { 0, N_("\t\tThis is a subdirectory which can be used to store\n"
 	    "\t\tuser defined gradients.  The default gimprc file\n"
diff --git a/app/install.c b/app/install.c
index b433c85224..1ae0bc2571 100644
--- a/app/install.c
+++ b/app/install.c
@@ -172,6 +172,12 @@ install_help (InstallCallback callback)
 	    "\t\twide gimp brushes installation when searching for\n"
 	    "\t\tbrushes.\n") },
 
+    { 1, N_("generated_brushes\n") },
+    { 0, N_("\t\tThis is a subdirectory which is used to store brushes\n"
+	    "\t\tthat are created with the brush editor.  The default\n"
+	    "\t\gimprc file checks this subdirectory when searching for\n"
+	    "\t\tgenerated brushes.\n") },
+
     { 1, N_("gradients\n") },
     { 0, N_("\t\tThis is a subdirectory which can be used to store\n"
 	    "\t\tuser defined gradients.  The default gimprc file\n"
diff --git a/app/preferences_dialog.c b/app/preferences_dialog.c
index be32a37ba5..af84450451 100644
--- a/app/preferences_dialog.c
+++ b/app/preferences_dialog.c
@@ -527,8 +527,11 @@ file_prefs_save_callback (GtkWidget *widget,
   if (thumbnail_mode != old_thumbnail_mode)
     update = g_list_append (update, "thumbnail-mode");
   if (trust_dirty_flag != old_trust_dirty_flag)
-    update = g_list_append (update, "trust-dirty-flag");
-
+    {
+      update = g_list_append (update, "trust-dirty-flag");
+      remove = g_list_append (update, "dont-trust-dirty-flag");
+    }
+  
   save_gimprc (&update, &remove);
 
   if (using_xserver_resolution)
diff --git a/app/user_install.c b/app/user_install.c
index b433c85224..1ae0bc2571 100644
--- a/app/user_install.c
+++ b/app/user_install.c
@@ -172,6 +172,12 @@ install_help (InstallCallback callback)
 	    "\t\twide gimp brushes installation when searching for\n"
 	    "\t\tbrushes.\n") },
 
+    { 1, N_("generated_brushes\n") },
+    { 0, N_("\t\tThis is a subdirectory which is used to store brushes\n"
+	    "\t\tthat are created with the brush editor.  The default\n"
+	    "\t\gimprc file checks this subdirectory when searching for\n"
+	    "\t\tgenerated brushes.\n") },
+
     { 1, N_("gradients\n") },
     { 0, N_("\t\tThis is a subdirectory which can be used to store\n"
 	    "\t\tuser defined gradients.  The default gimprc file\n"
diff --git a/data/misc/user_install b/data/misc/user_install
index c04ba7e2ff..541390fc15 100755
--- a/data/misc/user_install
+++ b/data/misc/user_install
@@ -24,6 +24,8 @@ cp $1/gtkrc $2/gtkrc
 
 echo "mkdir $2/brushes"
 mkdir $2/brushes
+echo "mkdir $2/generated_brushes"
+mkdir $2/generated_brushes
 echo "mkdir $2/gradients"
 mkdir $2/gradients
 echo "mkdir $2/palettes"
@@ -38,6 +40,10 @@ echo "mkdir $2/scripts"
 mkdir $2/scripts
 echo "mkdir $2/tmp"
 mkdir $2/tmp
+echo "mkdir $2/levels"
+mkdir $2/levels
+echo "mkdir $2/curves"
+mkdir $2/curves
 echo "mkdir $2/gfig"
 mkdir $2/gfig
 echo "mkdir $2/gflares"
@@ -52,10 +58,5 @@ echo "mkdir $2/gimpressionist/Paper"
 mkdir $2/gimpressionist/Paper
 echo "mkdir $2/gimpressionist/Presets"
 mkdir $2/gimpressionist/Presets
-echo "mkdir $2/levels"
-mkdir $2/levels
-echo "mkdir $2/curves"
-mkdir $2/curves
-
 echo "cp $1/palettes/* $2/palettes"
 cp $1/palettes/* $2/palettes
diff --git a/data/misc/user_install.bat b/data/misc/user_install.bat
index 41b6e1dfe7..2a48ba8b0f 100644
--- a/data/misc/user_install.bat
+++ b/data/misc/user_install.bat
@@ -5,6 +5,7 @@ copy %1\gimprc_user %2\gimprc
 copy %1\unitrc %2\unitrc
 copy %1\gtkrc_user %2\gtkrc
 mkdir %2\brushes
+mkdir %2\generated_brushes
 mkdir %2\gradients
 mkdir %2\palettes
 mkdir %2\patterns
diff --git a/etc/gimprc.in b/etc/gimprc.in
index 22caf312f1..c8efecd7b0 100644
--- a/etc/gimprc.in
+++ b/etc/gimprc.in
@@ -36,6 +36,10 @@
 #  brushes at startup.
 (brush-path "${gimp_dir}/brushes:${gimp_data_dir}/brushes")
 
+# Set the generated brush search path...this path will be searched for valid
+#  generated brushes at startup.
+(brush-vbr-path "${gimp_dir}/generated_brushes")
+
 # Specify a default brush. If none is specified it defaults to the
 #  "1circle.gbr" brush which is just a single pixel sized brush.
 #  The brush is searched for in the brush path.
@@ -197,13 +201,15 @@
 #  use the GIMP. To disable this behaviour, uncomment the line below...
 # (dont-save-session-info)
 
-# To let GIMP try to restore your last saved session, 
-#  uncomment the line below...
+# Session managment 
+#  To let GIMP try to restore your last saved session, 
+#  just uncomment the line below...
 # (always-restore-session)
 
 # Setting the level of interpolation
 #  Uncommenting this line will enable cubic interpolation.
-#  By default, GIMP uses linear interpolation, which is faster, but has poorer quality
+#  By default, GIMP uses linear interpolation, which is faster, but 
+#  has poorer quality
 # (cubic-interpolation)
 
 # Set the gamma correction values for the display
@@ -220,7 +226,7 @@
 #  by removing this line, or setting the values to 1.0.
 #  gamma-correction 1.0
 #  gamma-correction 2.0
-#                 ___
+#
 (gamma-correction 1.0)
 
 # Set the manner in which transparency is displayed in images
@@ -248,13 +254,42 @@
 #   %t  image type (RGB, indexed, greyscale)
 #   %z  zoom factor as a percentage
 #   %s  source scale factor
-#   %d  destination scale factor
+#   %Dx expands to x if the image is dirty
 (image-title-format "%f-%p.%i (%t) %z%%")
 
-# gfig pattern directory
+# Global paint options
+#  By default options for the paint tools are global, e.g. all paint tools
+#  use the options you specify in the brushes dialog. You can change this
+#  so each tool has its own settings by uncommenting the next line.
+# (no-global-paint-options)
+
+# Maximal new image size
+#  To prevent mistakes Gimp will warn you if you try to create a very large
+#  image. The default maximum memory consumption of the new image that 
+#  triggers the warning is 32MB.  
+(max-new-image-size 32M)
+
+# Trust dirty flag
+#  Gimp tries to keep track of changes to an image. If you trust this
+#  behaviour, nothing will happen if you save an unchanged image. By default
+#  this is turned off.
+#  Just uncomment the following line if you trust the dirty flag.
+# (trust-dirty-flag)
+
+# Gfig search path
+#  This path will be searched for Gfig figures when you use the Gfig plug-in.
 (gfig-path "${gimp_dir}/gfig:${gimp_data_dir}/gfig")
 
-# fractalexplorer path
+# Fractalexplorer path
+#  This path will be searched for fractals when you use the Fractalexplorer  
+#  plug-in.
 (fractalexplorer-path "${gimp_dir}/fractalexplorer:${gimp_data_dir}/fractalexplorer")
 
+# GFlare path
+#  This path will be searched for gflares when you use the GFlare plug-in.
+(gflare-path "${gimp_dir}/gflare:${gimp_data_dir}/gflare")
+
 # [end of file]
+
+
+
diff --git a/gimprc.in b/gimprc.in
index 22caf312f1..c8efecd7b0 100644
--- a/gimprc.in
+++ b/gimprc.in
@@ -36,6 +36,10 @@
 #  brushes at startup.
 (brush-path "${gimp_dir}/brushes:${gimp_data_dir}/brushes")
 
+# Set the generated brush search path...this path will be searched for valid
+#  generated brushes at startup.
+(brush-vbr-path "${gimp_dir}/generated_brushes")
+
 # Specify a default brush. If none is specified it defaults to the
 #  "1circle.gbr" brush which is just a single pixel sized brush.
 #  The brush is searched for in the brush path.
@@ -197,13 +201,15 @@
 #  use the GIMP. To disable this behaviour, uncomment the line below...
 # (dont-save-session-info)
 
-# To let GIMP try to restore your last saved session, 
-#  uncomment the line below...
+# Session managment 
+#  To let GIMP try to restore your last saved session, 
+#  just uncomment the line below...
 # (always-restore-session)
 
 # Setting the level of interpolation
 #  Uncommenting this line will enable cubic interpolation.
-#  By default, GIMP uses linear interpolation, which is faster, but has poorer quality
+#  By default, GIMP uses linear interpolation, which is faster, but 
+#  has poorer quality
 # (cubic-interpolation)
 
 # Set the gamma correction values for the display
@@ -220,7 +226,7 @@
 #  by removing this line, or setting the values to 1.0.
 #  gamma-correction 1.0
 #  gamma-correction 2.0
-#                 ___
+#
 (gamma-correction 1.0)
 
 # Set the manner in which transparency is displayed in images
@@ -248,13 +254,42 @@
 #   %t  image type (RGB, indexed, greyscale)
 #   %z  zoom factor as a percentage
 #   %s  source scale factor
-#   %d  destination scale factor
+#   %Dx expands to x if the image is dirty
 (image-title-format "%f-%p.%i (%t) %z%%")
 
-# gfig pattern directory
+# Global paint options
+#  By default options for the paint tools are global, e.g. all paint tools
+#  use the options you specify in the brushes dialog. You can change this
+#  so each tool has its own settings by uncommenting the next line.
+# (no-global-paint-options)
+
+# Maximal new image size
+#  To prevent mistakes Gimp will warn you if you try to create a very large
+#  image. The default maximum memory consumption of the new image that 
+#  triggers the warning is 32MB.  
+(max-new-image-size 32M)
+
+# Trust dirty flag
+#  Gimp tries to keep track of changes to an image. If you trust this
+#  behaviour, nothing will happen if you save an unchanged image. By default
+#  this is turned off.
+#  Just uncomment the following line if you trust the dirty flag.
+# (trust-dirty-flag)
+
+# Gfig search path
+#  This path will be searched for Gfig figures when you use the Gfig plug-in.
 (gfig-path "${gimp_dir}/gfig:${gimp_data_dir}/gfig")
 
-# fractalexplorer path
+# Fractalexplorer path
+#  This path will be searched for fractals when you use the Fractalexplorer  
+#  plug-in.
 (fractalexplorer-path "${gimp_dir}/fractalexplorer:${gimp_data_dir}/fractalexplorer")
 
+# GFlare path
+#  This path will be searched for gflares when you use the GFlare plug-in.
+(gflare-path "${gimp_dir}/gflare:${gimp_data_dir}/gflare")
+
 # [end of file]
+
+
+
diff --git a/user_install b/user_install
index c04ba7e2ff..541390fc15 100755
--- a/user_install
+++ b/user_install
@@ -24,6 +24,8 @@ cp $1/gtkrc $2/gtkrc
 
 echo "mkdir $2/brushes"
 mkdir $2/brushes
+echo "mkdir $2/generated_brushes"
+mkdir $2/generated_brushes
 echo "mkdir $2/gradients"
 mkdir $2/gradients
 echo "mkdir $2/palettes"
@@ -38,6 +40,10 @@ echo "mkdir $2/scripts"
 mkdir $2/scripts
 echo "mkdir $2/tmp"
 mkdir $2/tmp
+echo "mkdir $2/levels"
+mkdir $2/levels
+echo "mkdir $2/curves"
+mkdir $2/curves
 echo "mkdir $2/gfig"
 mkdir $2/gfig
 echo "mkdir $2/gflares"
@@ -52,10 +58,5 @@ echo "mkdir $2/gimpressionist/Paper"
 mkdir $2/gimpressionist/Paper
 echo "mkdir $2/gimpressionist/Presets"
 mkdir $2/gimpressionist/Presets
-echo "mkdir $2/levels"
-mkdir $2/levels
-echo "mkdir $2/curves"
-mkdir $2/curves
-
 echo "cp $1/palettes/* $2/palettes"
 cp $1/palettes/* $2/palettes
diff --git a/user_install.bat b/user_install.bat
index 41b6e1dfe7..2a48ba8b0f 100644
--- a/user_install.bat
+++ b/user_install.bat
@@ -5,6 +5,7 @@ copy %1\gimprc_user %2\gimprc
 copy %1\unitrc %2\unitrc
 copy %1\gtkrc_user %2\gtkrc
 mkdir %2\brushes
+mkdir %2\generated_brushes
 mkdir %2\gradients
 mkdir %2\palettes
 mkdir %2\patterns