diff --git a/ChangeLog b/ChangeLog
index 2ddb977f9cb2bea049e609c17962b1bc887d37d0..6996ed5f15b4088db7f582d2d44599019d050275 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-03-25  Michael Natterer  <mitch@gimp.org>
+
+	* app/actions/image-actions.c: remove "image-new-from-image"
+	action.
+
+	* app/actions/image-commands.[ch]: remove its callback and made
+	the "image-new" callback use the current image's dimensions
+	instead.
+
+	* menus/image-menu.xml.in: use the "image-new" action.
+
 2008-03-25  Michael Natterer  <mitch@gimp.org>
 
 	* app/display/gimpdisplayshell.c (gimp_display_shell_style_set):
diff --git a/app/actions/image-actions.c b/app/actions/image-actions.c
index cc3f5f164af057410b84dd5d3910127be7b8d683..2b275a97617f480203d233361e7d3b5915559f71 100644
--- a/app/actions/image-actions.c
+++ b/app/actions/image-actions.c
@@ -70,12 +70,6 @@ static const GimpActionEntry image_actions[] =
     G_CALLBACK (image_new_cmd_callback),
     GIMP_HELP_FILE_NEW },
 
-  { "image-new-from-image", GTK_STOCK_NEW,
-    N_("_New..."), NULL,
-    N_("Create a new image"),
-    G_CALLBACK (image_new_from_image_cmd_callback),
-    GIMP_HELP_FILE_NEW },
-
   { "image-resize", GIMP_STOCK_RESIZE,
     N_("Can_vas Size..."), NULL,
     N_("Adjust the image dimensions"),
@@ -201,16 +195,10 @@ static const GimpEnumActionEntry image_rotate_actions[] =
 void
 image_actions_setup (GimpActionGroup *group)
 {
-  GtkAction *action;
-
   gimp_action_group_add_actions (group,
                                  image_actions,
                                  G_N_ELEMENTS (image_actions));
 
-  action = gtk_action_group_get_action (GTK_ACTION_GROUP (group),
-                                        "image-new-from-image");
-  gtk_action_set_accel_path (action, "<Actions>/image/image-new");
-
   gimp_action_group_add_radio_actions (group,
                                        image_convert_actions,
                                        G_N_ELEMENTS (image_convert_actions),
diff --git a/app/actions/image-commands.c b/app/actions/image-commands.c
index fa280beb7f990440a5570729360e414fc33b7fd0..73b57170e5c440557329d16165d0b35780b5b2f8 100644
--- a/app/actions/image-commands.c
+++ b/app/actions/image-commands.c
@@ -127,26 +127,6 @@ image_new_cmd_callback (GtkAction *action,
   GtkWidget *dialog;
   return_if_no_widget (widget, data);
 
-  dialog = gimp_dialog_factory_dialog_new (global_dialog_factory,
-                                           gtk_widget_get_screen (widget),
-                                           "gimp-image-new-dialog", -1, FALSE);
-
-  if (dialog)
-    {
-      image_new_dialog_set (dialog, NULL, NULL);
-
-      gtk_window_present (GTK_WINDOW (dialog));
-    }
-}
-
-void
-image_new_from_image_cmd_callback (GtkAction *action,
-                                   gpointer   data)
-{
-  GtkWidget *widget;
-  GtkWidget *dialog;
-  return_if_no_widget (widget, data);
-
   dialog = gimp_dialog_factory_dialog_new (global_dialog_factory,
                                            gtk_widget_get_screen (widget),
                                            "gimp-image-new-dialog", -1, FALSE);
diff --git a/app/actions/image-commands.h b/app/actions/image-commands.h
index 58206a6b78cc357587649cc3ca4728d22ffb5502..38f83e624b4b182325d9c1501b746d8662803875 100644
--- a/app/actions/image-commands.h
+++ b/app/actions/image-commands.h
@@ -22,8 +22,6 @@
 
 void   image_new_cmd_callback                 (GtkAction *action,
                                                gpointer   data);
-void   image_new_from_image_cmd_callback      (GtkAction *action,
-                                               gpointer   data);
 
 void   image_convert_cmd_callback             (GtkAction *action,
                                                GtkAction *current,
@@ -51,15 +49,15 @@ void   image_crop_cmd_callback                (GtkAction *action,
 void   image_duplicate_cmd_callback           (GtkAction *action,
                                                gpointer   data);
 
-void   image_merge_layers_cmd_callback     (GtkAction *action,
-                                            gpointer   data);
-void   image_flatten_image_cmd_callback    (GtkAction *action,
-                                            gpointer   data);
+void   image_merge_layers_cmd_callback        (GtkAction *action,
+                                               gpointer   data);
+void   image_flatten_image_cmd_callback       (GtkAction *action,
+                                               gpointer   data);
 
-void   image_configure_grid_cmd_callback   (GtkAction *action,
-                                            gpointer   data);
-void   image_properties_cmd_callback       (GtkAction *action,
-                                            gpointer   data);
+void   image_configure_grid_cmd_callback      (GtkAction *action,
+                                               gpointer   data);
+void   image_properties_cmd_callback          (GtkAction *action,
+                                               gpointer   data);
 
 
 #endif /* __IMAGE_COMMANDS_H__ */
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index 8ebf42fcfc6c6e98a5ca54f98c8a3cbbd9a58f65..f629c94ae9c26234d5fc6c50888eb97d7bca3b2a 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -6,7 +6,7 @@
 
     <menu action="file-menu" name="File">
       <placeholder name="New">
-        <menuitem action="image-new-from-image" />
+        <menuitem action="image-new" />
       </placeholder>
       <placeholder name="Open">
         <menuitem action="file-open" />