diff --git a/ChangeLog b/ChangeLog
index eaf74bbfdb..0fade88da7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 	valid IDs. Added "none_ok" parameter to all ID param spec
 	constructors.
 
+	* app/xcf/xcf.c: require real image IDs, but allow images without
+	active drawable.
+
 	* app/pdb/gimp-pdb-compat.c: set none_ok to TRUE in all compat
 	param specs, so only IDs that are really random garbage don't pass
 	validation. Fixes validation errors with 0 and -1 IDs.
diff --git a/app/xcf/xcf.c b/app/xcf/xcf.c
index b16b09c59c..c8613d6e61 100644
--- a/app/xcf/xcf.c
+++ b/app/xcf/xcf.c
@@ -174,13 +174,13 @@ xcf_init (Gimp *gimp)
                                gimp_param_spec_image_id ("image",
                                                          "Image",
                                                          "Input image",
-                                                         gimp,
+                                                         gimp, FALSE,
                                                          GIMP_PARAM_READWRITE));
   gimp_procedure_add_argument (procedure,
                                gimp_param_spec_drawable_id ("drawable",
                                                             "Drawable",
                                                             "Active drawable of input image",
-                                                            gimp,
+                                                            gimp, TRUE,
                                                             GIMP_PARAM_READWRITE));
   gimp_procedure_add_argument (procedure,
                                gimp_param_spec_string ("filename",
@@ -258,7 +258,7 @@ xcf_init (Gimp *gimp)
                                    gimp_param_spec_image_id ("image",
                                                              "Image",
                                                              "Output image",
-                                                             gimp,
+                                                             gimp, FALSE,
                                                              GIMP_PARAM_READWRITE));
   gimp_plug_in_manager_add_procedure (gimp->plug_in_manager, proc);
   g_object_unref (procedure);