diff --git a/ChangeLog b/ChangeLog
index 753bf79200..d1e04c1cb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-22  Sven Neumann  <sven@gimp.org>
+
+	* app/core/gimplayer.c (gimp_layer_add_mask): allow adding a mask
+	to a layer without alpha channel (bug #316207).
+
 2007-03-21  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/common/svg.c: fixed incorrect PDB documentation.
diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c
index 431babb428..731c827cad 100644
--- a/app/core/gimplayer.c
+++ b/app/core/gimplayer.c
@@ -1234,13 +1234,6 @@ gimp_layer_add_mask (GimpLayer     *layer,
       return NULL;
     }
 
-  if (! gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)))
-    {
-      g_message (_("Cannot add layer mask to a layer "
-                   "with no alpha channel."));
-      return NULL;
-    }
-
   if ((gimp_item_width (GIMP_ITEM (layer)) !=
        gimp_item_width (GIMP_ITEM (mask))) ||
       (gimp_item_height (GIMP_ITEM (layer)) !=