diff --git a/ChangeLog b/ChangeLog
index eff5ec78c5..1d07509488 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-02-11  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: enable support for multiple processors by default.
+	Hyperthreading and multicore CPUs are becoming common and we
+	should try to give this as much testing as possible.
+
+	* app/config/gimpbaseconfig.c: use two processors by default. Also
+	increased default tile-cache-size to 256MB.
+
 2005-02-11  Sven Neumann  <sven@gimp.org>
 
 	* app/widgets/gimptoolbox.c (toolbox_paste_received): drop
diff --git a/app/config/gimpbaseconfig.c b/app/config/gimpbaseconfig.c
index 993c9f4f05..13b5f2be36 100644
--- a/app/config/gimpbaseconfig.c
+++ b/app/config/gimpbaseconfig.c
@@ -111,16 +111,17 @@ gimp_base_config_class_init (GimpBaseConfigClass *klass)
                                  "${gimp_dir}",
                                  GIMP_CONFIG_PARAM_RESTART);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_STINGY_MEMORY_USE,
-                                    "stingy-memory-use", STINGY_MEMORY_USE_BLURB,
+                                    "stingy-memory-use",
+                                    STINGY_MEMORY_USE_BLURB,
                                     FALSE,
                                     GIMP_CONFIG_PARAM_RESTART);
   GIMP_CONFIG_INSTALL_PROP_UINT (object_class, PROP_NUM_PROCESSORS,
                                  "num-processors", NUM_PROCESSORS_BLURB,
-                                 1, 30, 1,
+                                 1, 16, 2,
                                  0);
   GIMP_CONFIG_INSTALL_PROP_MEMSIZE (object_class, PROP_TILE_CACHE_SIZE,
                                     "tile-cache-size", TILE_CACHE_SIZE_BLURB,
-                                    0, GIMP_MAX_MEMSIZE, 1 << 27, /* 128MB */
+                                    0, GIMP_MAX_MEMSIZE, 1 << 28, /* 256MB */
                                     GIMP_CONFIG_PARAM_CONFIRM);
 }
 
diff --git a/configure.in b/configure.in
index 8ca2c56bc1..59dcd49d55 100644
--- a/configure.in
+++ b/configure.in
@@ -818,8 +818,8 @@ AC_SUBST(GIMP_THREAD_FLAGS)
 AC_SUBST(GIMP_THREAD_LIBS)
 
 
-AC_ARG_ENABLE(mp, [  --enable-mp             support multiple processors (default=no)])
-if test "x$enable_mp" = "xyes"; then
+AC_ARG_ENABLE(mp, [  --enable-mp             support multiple processors (default=yes)])
+if test "x$enable_mp" != "xno"; then
   AC_CHECK_LIB(pthread, pthread_attr_init, 
     [AC_DEFINE(ENABLE_MP, 1,
 	       [Define to 1 to enable support for multiple processors.])