diff --git a/ChangeLog b/ChangeLog
index d1db9cbf86dec355a25272de811499dca815860a..068124830c9cf8bc6191d30edbd2843e625e40f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 19 21:36:41 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* Made 0.99.22 release
+	* app/undo.c: handle exposure correctly
+	
 Thu Mar 19 22:05:56 CST 1998  Larry Ewing  <lewing@gimp.org>
 
 	* app/palette.c: fixed out of bounds reference in pallete_create.
diff --git a/NOTES b/NOTES
index 570ed47098fef9ba391e33ac9e8e4e5b24072afc..90434ddfc9ba6cb3b4cedf1244141087dd975c81 100644
--- a/NOTES
+++ b/NOTES
@@ -1,7 +1,7 @@
-Some notes on GIMP-0.99.21:
+Some notes on GIMP-0.99.22:
 
 Please remove everything from your old plugins dir before upgrading to
-0.99.21. Some plugins are no longer in the dist and will not be updated.
+0.99.22. Some plugins are no longer in the dist and will not be updated.
 
 -- Federico Mena <federico@nuclecu.unam.mx>
 -- Christoph Hoegl <darkwing@bsddmail.franken.de>
diff --git a/README b/README
index d3c7e0de0637ce8e4d26884c5ff39ce18359f035..b35d07556a8eebf9fe58add1cf2a5f2f2683f5e6 100644
--- a/README
+++ b/README
@@ -1,12 +1,12 @@
 The GIMP: the GNU Image Manipulation Program
 --------------------------------------------
 
-This is version 0.99.21 of the GIMP. For the most part it contains all
+This is version 0.99.22 of the GIMP. For the most part it contains all
 of the features that will be in version 1.0 of the GIMP. It does,
 however, lack a) documentation, b) robustness and c) some of the
 plug-ins found in the 0.54 version.
 
-The main difference between v0.99.21 and much earlier versions is the
+The main difference between v0.99.22 and much earlier versions is the
 use of a tile based memory management for images. This allows the GIMP
 to work with images much larger than physical memory in a usable
 fashion. Before such memory management, the GIMP was nearly unusable
diff --git a/app/core/gimpimage-undo-push.c b/app/core/gimpimage-undo-push.c
index 90f7f2cf44738cdb2146328d9d4b4ff1ca6f4064..7575b0259ab758ba983565abd918bd399d7cfef9 100644
--- a/app/core/gimpimage-undo-push.c
+++ b/app/core/gimpimage-undo-push.c
@@ -275,6 +275,8 @@ pop_stack (GImage  *gimage,
   GSList *tmp;
   int status = 0;
   int in_group = 0;
+  int x, y;
+  GDisplay *gdisp;
 
   /*  Keep popping until we pop a valid object
    *  or get to the end of a group if we're in one
@@ -312,6 +314,27 @@ pop_stack (GImage  *gimage,
       if (status && !in_group)
 	{
 	  /*  Flush any image updates and displays  */
+	  gdisp = gdisplay_active();
+	  if (gdisp != NULL) {
+	    if (gdisp->disp_xoffset || gdisp->disp_yoffset)
+	      {
+		gdk_window_get_size (gdisp->canvas->window, &x, &y);
+		if (gdisp->disp_yoffset)
+		  {
+		    gdisplay_expose_area (gdisp, 0, 0, gdisp->disp_width,
+					  gdisp->disp_yoffset);
+		    gdisplay_expose_area (gdisp, 0, gdisp->disp_yoffset + y,
+					  gdisp->disp_width, gdisp->disp_height);
+		  }
+		if (gdisp->disp_xoffset)
+		  {
+		    gdisplay_expose_area (gdisp, 0, 0, gdisp->disp_xoffset,
+					  gdisp->disp_height);
+		    gdisplay_expose_area (gdisp, gdisp->disp_xoffset + x, 0,
+					  gdisp->disp_width, gdisp->disp_height);
+		  }
+	      }
+	  }
 	  gdisplays_flush ();
 
 	  /*  If the shrink_wrap flag was set  */
diff --git a/app/undo.c b/app/undo.c
index 90f7f2cf44738cdb2146328d9d4b4ff1ca6f4064..7575b0259ab758ba983565abd918bd399d7cfef9 100644
--- a/app/undo.c
+++ b/app/undo.c
@@ -275,6 +275,8 @@ pop_stack (GImage  *gimage,
   GSList *tmp;
   int status = 0;
   int in_group = 0;
+  int x, y;
+  GDisplay *gdisp;
 
   /*  Keep popping until we pop a valid object
    *  or get to the end of a group if we're in one
@@ -312,6 +314,27 @@ pop_stack (GImage  *gimage,
       if (status && !in_group)
 	{
 	  /*  Flush any image updates and displays  */
+	  gdisp = gdisplay_active();
+	  if (gdisp != NULL) {
+	    if (gdisp->disp_xoffset || gdisp->disp_yoffset)
+	      {
+		gdk_window_get_size (gdisp->canvas->window, &x, &y);
+		if (gdisp->disp_yoffset)
+		  {
+		    gdisplay_expose_area (gdisp, 0, 0, gdisp->disp_width,
+					  gdisp->disp_yoffset);
+		    gdisplay_expose_area (gdisp, 0, gdisp->disp_yoffset + y,
+					  gdisp->disp_width, gdisp->disp_height);
+		  }
+		if (gdisp->disp_xoffset)
+		  {
+		    gdisplay_expose_area (gdisp, 0, 0, gdisp->disp_xoffset,
+					  gdisp->disp_height);
+		    gdisplay_expose_area (gdisp, gdisp->disp_xoffset + x, 0,
+					  gdisp->disp_width, gdisp->disp_height);
+		  }
+	      }
+	  }
 	  gdisplays_flush ();
 
 	  /*  If the shrink_wrap flag was set  */
diff --git a/configure.in b/configure.in
index 630af4e569300bf5913fb562efc145b905180961..79114b1be0a468c2e15c3ddbb6ba51dc0ba4ce14 100644
--- a/configure.in
+++ b/configure.in
@@ -7,10 +7,10 @@ GIMP_MAJOR_VERSION_NUMBER=0
 dnl $Format: "GIMP_MINOR_VERSION_NUMBER=$ReleaseMinorVersion$" $
 GIMP_MINOR_VERSION_NUMBER=99
 dnl $Format: "GIMP_MICRO_VERSION_NUMBER=$ReleaseMicroVersion$" $
-GIMP_MICRO_VERSION_NUMBER=21
+GIMP_MICRO_VERSION_NUMBER=22
 
 dnl $Format: "AM_INIT_AUTOMAKE(gimp, $ReleaseVersion$)" $
-AM_INIT_AUTOMAKE(gimp, 0.99.21)
+AM_INIT_AUTOMAKE(gimp, 0.99.22)
 
 dnl Specify a header configuration file
 AM_CONFIG_HEADER(config.h)