diff --git a/ChangeLog b/ChangeLog
index 45f7973d48..629ec3a9eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Dec  8 11:43:17 EST 1997 Adrian Likins <adrian@gimp.org>
+
+	* updated iwarp to latest version
+
+	* added Sven Neumans patch for 32-bit color in gck
+
+	* fixed gimp_tips.txt (the tip about the "add alpha")
+
+
 Mon Dec  8 02:13:36 PST 1997  Manish Singh <yosh@gimp.org>
 
 	* app/about_dialog.c: Added Nathan Summers patch to make it
diff --git a/app/about_dialog.c b/app/about_dialog.c
index 4af16b767f..2f8b7a005e 100644
--- a/app/about_dialog.c
+++ b/app/about_dialog.c
@@ -69,6 +69,7 @@ static char *scroll_text[] =
   "Federico Mena",
   "Adam D. Moss",
   "Shuji Narazaki",
+  "Sven Neumann",
   "Stephen Robert Norris",
   "Erik Nygren",
   "Miles O'Neal",
@@ -79,6 +80,7 @@ static char *scroll_text[] =
   "Mike Schaeffer",
   "Tracy Scott",
   "Manish Singh",
+  "Mike Sweet",
   "Eiichi Takamori",
   "Tristan Tarrant",
   "Owen Taylor",
diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c
index 4af16b767f..2f8b7a005e 100644
--- a/app/dialogs/about-dialog.c
+++ b/app/dialogs/about-dialog.c
@@ -69,6 +69,7 @@ static char *scroll_text[] =
   "Federico Mena",
   "Adam D. Moss",
   "Shuji Narazaki",
+  "Sven Neumann",
   "Stephen Robert Norris",
   "Erik Nygren",
   "Miles O'Neal",
@@ -79,6 +80,7 @@ static char *scroll_text[] =
   "Mike Schaeffer",
   "Tracy Scott",
   "Manish Singh",
+  "Mike Sweet",
   "Eiichi Takamori",
   "Tristan Tarrant",
   "Owen Taylor",
diff --git a/app/gui/about-dialog.c b/app/gui/about-dialog.c
index 4af16b767f..2f8b7a005e 100644
--- a/app/gui/about-dialog.c
+++ b/app/gui/about-dialog.c
@@ -69,6 +69,7 @@ static char *scroll_text[] =
   "Federico Mena",
   "Adam D. Moss",
   "Shuji Narazaki",
+  "Sven Neumann",
   "Stephen Robert Norris",
   "Erik Nygren",
   "Miles O'Neal",
@@ -79,6 +80,7 @@ static char *scroll_text[] =
   "Mike Schaeffer",
   "Tracy Scott",
   "Manish Singh",
+  "Mike Sweet",
   "Eiichi Takamori",
   "Tristan Tarrant",
   "Owen Taylor",
diff --git a/gimp_tips.txt b/gimp_tips.txt
index db7706b0e6..d3f2cc8610 100644
--- a/gimp_tips.txt
+++ b/gimp_tips.txt
@@ -44,8 +44,7 @@ You can change the name of a layer by double-clicking on its name in
 the Layers dialog box.
 
 The layer named "Background" is special.  You can't add transparency 
-or a layer mask to it.  However, if you rename it, it will behave
-like a normal layer.
+or a layer mask to it.  To add transparency, you must first "Add alpha" to the layer by right-clicking in the layers dialog and selecting "Add alpha to layer". 
 
 When using a drawing tool (Paintbrush, Airbrush, or Pencil), Shift-click
 will draw a straight line from your last drawing point to your current
diff --git a/plug-ins/common/iwarp.c b/plug-ins/common/iwarp.c
index 5f15ad5a27..86efb49df5 100644
--- a/plug-ins/common/iwarp.c
+++ b/plug-ins/common/iwarp.c
@@ -28,9 +28,9 @@
 
    Most of the gimp and gtk specific code is taken from other plug-ins 
 
-   v0.11
-    animation of non-alpha layers (background) creates now layers with alpha
-    channel. (thanks to Adrian Likins for reporting this bug)
+   v0.11a
+    animation of non-alpha layers (background) creates now layers with 
+    alpha channel. (thanks to Adrian Likins for reporting this bug)
 
 */
 
@@ -494,7 +494,7 @@ iwarp_supersample(gint sxl,gint syl ,gint sxr, gint syr,guchar* dest_data,int st
     if (layer_alpha) dest = dest_data+(col-syl)*(stride)+(row-sxl)*(image_bpp+1);
     else  dest = dest_data+(col-syl)*stride+(row-sxl)*image_bpp;
     for (i=0; i<image_bpp; i++) *dest++ = color[i] / cc;
-    if (layer_alpha) dest++; 
+    if (layer_alpha) *dest++ = 255; 
     (*progress)++;
   }      
   gimp_progress_update((double) (*progress) / max_progress);
@@ -537,12 +537,12 @@ iwarp_frame()
 	        if (fabs(xv) > 0.0 || fabs(yv) > 0.0) { 
 	          iwarp_get_point(pre2img * xv +col, pre2img *yv +row,color);
  	          for (i=0; i<image_bpp; i++) *dest++ = color[i];
-                  if (layer_alpha) dest++;
+                  if (layer_alpha) *dest++ = 255;
  	        }
  	        else {
  	         iwarp_get_pixel(col,row,color);
  	         for (i=0; i<image_bpp; i++) *dest++ = color[i];
- 	         if (layer_alpha) dest++;
+ 	         if (layer_alpha) *dest++ = 255;
  	        }  
 	     }
 	     dest_row += dest_rgn.rowstride;
diff --git a/plug-ins/iwarp/iwarp.c b/plug-ins/iwarp/iwarp.c
index 5f15ad5a27..86efb49df5 100644
--- a/plug-ins/iwarp/iwarp.c
+++ b/plug-ins/iwarp/iwarp.c
@@ -28,9 +28,9 @@
 
    Most of the gimp and gtk specific code is taken from other plug-ins 
 
-   v0.11
-    animation of non-alpha layers (background) creates now layers with alpha
-    channel. (thanks to Adrian Likins for reporting this bug)
+   v0.11a
+    animation of non-alpha layers (background) creates now layers with 
+    alpha channel. (thanks to Adrian Likins for reporting this bug)
 
 */
 
@@ -494,7 +494,7 @@ iwarp_supersample(gint sxl,gint syl ,gint sxr, gint syr,guchar* dest_data,int st
     if (layer_alpha) dest = dest_data+(col-syl)*(stride)+(row-sxl)*(image_bpp+1);
     else  dest = dest_data+(col-syl)*stride+(row-sxl)*image_bpp;
     for (i=0; i<image_bpp; i++) *dest++ = color[i] / cc;
-    if (layer_alpha) dest++; 
+    if (layer_alpha) *dest++ = 255; 
     (*progress)++;
   }      
   gimp_progress_update((double) (*progress) / max_progress);
@@ -537,12 +537,12 @@ iwarp_frame()
 	        if (fabs(xv) > 0.0 || fabs(yv) > 0.0) { 
 	          iwarp_get_point(pre2img * xv +col, pre2img *yv +row,color);
  	          for (i=0; i<image_bpp; i++) *dest++ = color[i];
-                  if (layer_alpha) dest++;
+                  if (layer_alpha) *dest++ = 255;
  	        }
  	        else {
  	         iwarp_get_pixel(col,row,color);
  	         for (i=0; i<image_bpp; i++) *dest++ = color[i];
- 	         if (layer_alpha) dest++;
+ 	         if (layer_alpha) *dest++ = 255;
  	        }  
 	     }
 	     dest_row += dest_rgn.rowstride;
diff --git a/plug-ins/libgck/gck/gckcolor.c b/plug-ins/libgck/gck/gckcolor.c
index 87ba0cf79b..e4a388e7a9 100644
--- a/plug-ins/libgck/gck/gckcolor.c
+++ b/plug-ins/libgck/gck/gckcolor.c
@@ -1792,9 +1792,10 @@ void gck_rgb_to_image32(GckVisualInfo * visinfo,
 	      g = (guint32) RGB_data[count++];
 	      b = (guint32) RGB_data[count++];
 
-	      r = r << 24;
-	      g = g << 16;
-	      b = b << 8;
+	      /* changed to work on 32 bit displays */
+	      r = r << 16;
+	      g = g << 8;
+	      b = b;
 
 	      pixel = r | g | b;
 	      *imagedata = pixel;