diff --git a/ChangeLog b/ChangeLog
index cb2e54a25a..db9ba0a2db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-13  Michael Natterer  <mitch@gimp.org>
+
+	* app/core/gimplayer.c (gimp_layer_transform): add an alpha
+	channel if the layer has none and interpolation is requested.
+	Works around bug #315048, the real fix would be to implement
+	interpolation on layers without alpha.
+
 2006-05-13  Michael Natterer  <mitch@gimp.org>
 
 	Added some new text layer actions and menu items (bug #316299).
diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c
index 1999767c71..1b21db397d 100644
--- a/app/core/gimplayer.c
+++ b/app/core/gimplayer.c
@@ -783,6 +783,13 @@ gimp_layer_transform (GimpItem               *item,
 {
   GimpLayer *layer = GIMP_LAYER (item);
 
+#ifdef __GNUC__
+#warning FIXME: make interpolated transformations work on layers without alpha
+#endif
+  if (interpolation_type != GIMP_INTERPOLATION_NONE &&
+      ! gimp_drawable_has_alpha (GIMP_DRAWABLE (item)))
+    gimp_layer_add_alpha (layer);
+
   GIMP_ITEM_CLASS (parent_class)->transform (item, context, matrix, direction,
                                              interpolation_type,
                                              supersample, recursion_level,