diff --git a/ChangeLog b/ChangeLog
index ffa6b5c764..b288e05f22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Apr 12 02:23:05 PDT 1998 Manish Singh <yosh@gimp.org>
+
+	* configure.in: I guess it didn't end... an attempt to try to
+	recognize all types of tiff configs
+
+	* app/gdisplay_ops.c: resize on zoom fix for naught window
+	positioning from Kevin Cozens <kcozens@interlog.com>
+
+	* app/errors.c: gdk_exit needs to be prototyped
+
 Sun Apr 12 01:19:35 PDT 1998 Manish Singh <yosh@gimp.org>
 
 	* configure.in: more fixes... when will it all end...
diff --git a/app/display/gimpdisplay-ops.c b/app/display/gimpdisplay-ops.c
index 0f0bbc57fd..1983bce2a8 100644
--- a/app/display/gimpdisplay-ops.c
+++ b/app/display/gimpdisplay-ops.c
@@ -153,8 +153,8 @@ gdisplay_shrink_wrap (GDisplay *gdisp)
       shell_width = width + border_x;
       shell_height = height + border_y;
 
-      x = HIGHPASS (shell_x, BOUNDS (s_width - shell_width, 0, s_width));
-      y = HIGHPASS (shell_y, BOUNDS (s_height - shell_height, 0, s_height));
+      x = HIGHPASS (shell_x, BOUNDS (s_width - shell_width, border_x, s_width));
+      y = HIGHPASS (shell_y, BOUNDS (s_height - shell_height, border_y, s_height));
 
       if (x != shell_x || y != shell_y)
 	gdk_window_move (gdisp->shell->window, x, y);
@@ -182,8 +182,8 @@ gdisplay_shrink_wrap (GDisplay *gdisp)
       shell_width = width + border_x;
       shell_height = height + border_y;
 
-      x = HIGHPASS (shell_x, BOUNDS (s_width - shell_width, 0, s_width));
-      y = HIGHPASS (shell_y, BOUNDS (s_height - shell_height, 0, s_height));
+      x = HIGHPASS (shell_x, BOUNDS (s_width - shell_width, border_x, s_width));
+      y = HIGHPASS (shell_y, BOUNDS (s_height - shell_height, border_y, s_height));
 
       if (x != shell_x || y != shell_y)
 	gdk_window_move (gdisp->shell->window, x, y);
diff --git a/app/errors.c b/app/errors.c
index f14620806c..277002ecc1 100644
--- a/app/errors.c
+++ b/app/errors.c
@@ -25,6 +25,7 @@
 #include <unistd.h>
 
 #include <glib.h>
+#include <gdk/gdk.h>
 #include "app_procs.h"
 #include "errors.h"
 
diff --git a/app/gdisplay_ops.c b/app/gdisplay_ops.c
index 0f0bbc57fd..1983bce2a8 100644
--- a/app/gdisplay_ops.c
+++ b/app/gdisplay_ops.c
@@ -153,8 +153,8 @@ gdisplay_shrink_wrap (GDisplay *gdisp)
       shell_width = width + border_x;
       shell_height = height + border_y;
 
-      x = HIGHPASS (shell_x, BOUNDS (s_width - shell_width, 0, s_width));
-      y = HIGHPASS (shell_y, BOUNDS (s_height - shell_height, 0, s_height));
+      x = HIGHPASS (shell_x, BOUNDS (s_width - shell_width, border_x, s_width));
+      y = HIGHPASS (shell_y, BOUNDS (s_height - shell_height, border_y, s_height));
 
       if (x != shell_x || y != shell_y)
 	gdk_window_move (gdisp->shell->window, x, y);
@@ -182,8 +182,8 @@ gdisplay_shrink_wrap (GDisplay *gdisp)
       shell_width = width + border_x;
       shell_height = height + border_y;
 
-      x = HIGHPASS (shell_x, BOUNDS (s_width - shell_width, 0, s_width));
-      y = HIGHPASS (shell_y, BOUNDS (s_height - shell_height, 0, s_height));
+      x = HIGHPASS (shell_x, BOUNDS (s_width - shell_width, border_x, s_width));
+      y = HIGHPASS (shell_y, BOUNDS (s_height - shell_height, border_y, s_height));
 
       if (x != shell_x || y != shell_y)
 	gdk_window_move (gdisp->shell->window, x, y);
diff --git a/configure.in b/configure.in
index 5920f927af..ccf7093cfe 100644
--- a/configure.in
+++ b/configure.in
@@ -121,9 +121,13 @@ dnl Test for libtiff
 	AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
       AC_CHECK_LIB(tiff, TIFFWriteScanline,
 	AC_CHECK_HEADER(tiffio.h,
-          TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg',
+          TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg',
 	  AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
-        AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -lz -ljpeg -lm), -lm)
+	AC_CHECK_LIB(tiff, TIFFFlushData,
+	  AC_CHECK_HEADER(tiffio.h,
+            TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz',
+	    AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
+        AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lm), -lm)
   fi
 
 dnl Test for libjpeg