diff --git a/ChangeLog b/ChangeLog
index f8b6da8f65..635bad3405 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-22  Michael Natterer  <mitch@gimp.org>
+
+	* app/display/gimpdisplayshell-render.c: allocate all temporary
+	render bufs and check bufs large enough for GIMP_PREVIEW_MAX_SIZE
+	(which is 1024). Fixes crashes with too large navigation previews.
+
 2002-08-22  Maurits Rijk  <lpeek.mrijk@consunet.nl>
 
 	* plug-ins/imagemap/imap_main.c (save_as_csim)
diff --git a/app/display/gimpdisplayshell-render.c b/app/display/gimpdisplayshell-render.c
index c45f18f8d7..a7508f2840 100644
--- a/app/display/gimpdisplayshell-render.c
+++ b/app/display/gimpdisplayshell-render.c
@@ -143,7 +143,10 @@ render_setup (GimpCheckType check_type,
   g_free (render_empty_buf);
   g_free (render_temp_buf);
 
-#define MAX_PREVIEW_SIZE 256  /* EEK */
+#ifdef __GNUC__
+#warning #define MAX_PREVIEW_SIZE 1024  /* GIMP_PREVIEW_MAX_SIZE (EEK) */
+#endif
+#define MAX_PREVIEW_SIZE 1024  /* GIMP_PREVIEW_MAX_SIZE (EEK) */
 
   /*  calculate check buffer for previews  */
   if (TRUE /* preview_size */)