diff --git a/ChangeLog b/ChangeLog
index 263afbf4f8..1da4517218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-16  Sven Neumann  <sven@gimp.org>
+
+	* app/paint/paint-enums.[ch]: changed description of
+	GIMP_CLONE_ALIGN_NO enum value.
+
+	* app/tools/gimpclonetool.c (gimp_clone_options_gui): use a combo
+	box for the align mode.
+
 2005-12-14  Sven Neumann  <sven@gimp.org>
 
 	* libgimpbase/gimpprotocol.[ch]: declare gp_params_destroy() in
diff --git a/app/paint/paint-enums.c b/app/paint/paint-enums.c
index 735c5c5a5e..6b2ec0a426 100644
--- a/app/paint/paint-enums.c
+++ b/app/paint/paint-enums.c
@@ -22,7 +22,7 @@ gimp_clone_align_mode_get_type (void)
 
   static const GimpEnumDesc descs[] =
   {
-    { GIMP_CLONE_ALIGN_NO, N_("Non-aligned"), NULL },
+    { GIMP_CLONE_ALIGN_NO, N_("None"), NULL },
     { GIMP_CLONE_ALIGN_YES, N_("Aligned"), NULL },
     { GIMP_CLONE_ALIGN_REGISTERED, N_("Registered"), NULL },
     { GIMP_CLONE_ALIGN_FIXED, N_("Fixed"), NULL },
diff --git a/app/paint/paint-enums.h b/app/paint/paint-enums.h
index 3a878cc414..7ac856187a 100644
--- a/app/paint/paint-enums.h
+++ b/app/paint/paint-enums.h
@@ -41,7 +41,7 @@ GType gimp_clone_align_mode_get_type (void) G_GNUC_CONST;
 
 typedef enum /*< pdb-skip >*/
 {
-  GIMP_CLONE_ALIGN_NO,          /*< desc="Non-aligned" >*/
+  GIMP_CLONE_ALIGN_NO,          /*< desc="None"        >*/
   GIMP_CLONE_ALIGN_YES,         /*< desc="Aligned"     >*/
   GIMP_CLONE_ALIGN_REGISTERED,  /*< desc="Registered"  >*/
   GIMP_CLONE_ALIGN_FIXED        /*< desc="Fixed"       >*/
diff --git a/app/tools/gimpclonetool.c b/app/tools/gimpclonetool.c
index aa92f094c4..c1296d2558 100644
--- a/app/tools/gimpclonetool.c
+++ b/app/tools/gimpclonetool.c
@@ -289,14 +289,15 @@ gimp_clone_options_gui (GimpToolOptions *tool_options)
   GObject   *config = G_OBJECT (tool_options);
   GtkWidget *vbox;
   GtkWidget *frame;
-  GtkWidget *hbox;
   GtkWidget *button;
+  GtkWidget *hbox;
+  GtkWidget *table;
+  GtkWidget *combo;
 
   vbox = gimp_paint_options_gui (tool_options);
 
   frame = gimp_prop_enum_radio_frame_new (config, "clone-type",
-                                          _("Source"),
-                                          0, 0);
+                                          _("Source"), 0, 0);
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
@@ -307,11 +308,15 @@ gimp_clone_options_gui (GimpToolOptions *tool_options)
   hbox = gimp_pattern_box_new (NULL, GIMP_CONTEXT (tool_options), 2);
   gimp_enum_radio_frame_add (GTK_FRAME (frame), hbox, GIMP_PATTERN_CLONE);
 
-  frame = gimp_prop_enum_radio_frame_new (config, "align-mode",
-                                          _("Alignment"),
-                                          0, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-  gtk_widget_show (frame);
+  table = gtk_table_new (1, 2, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 2);
+  gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  combo = gimp_prop_enum_combo_box_new (config, "align-mode", 0, 0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
+                             _("Alignment:"), 0.0, 0.5,
+                             combo, 1, FALSE);
 
   return vbox;
 }
diff --git a/app/tools/gimpsourcetool.c b/app/tools/gimpsourcetool.c
index aa92f094c4..c1296d2558 100644
--- a/app/tools/gimpsourcetool.c
+++ b/app/tools/gimpsourcetool.c
@@ -289,14 +289,15 @@ gimp_clone_options_gui (GimpToolOptions *tool_options)
   GObject   *config = G_OBJECT (tool_options);
   GtkWidget *vbox;
   GtkWidget *frame;
-  GtkWidget *hbox;
   GtkWidget *button;
+  GtkWidget *hbox;
+  GtkWidget *table;
+  GtkWidget *combo;
 
   vbox = gimp_paint_options_gui (tool_options);
 
   frame = gimp_prop_enum_radio_frame_new (config, "clone-type",
-                                          _("Source"),
-                                          0, 0);
+                                          _("Source"), 0, 0);
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
@@ -307,11 +308,15 @@ gimp_clone_options_gui (GimpToolOptions *tool_options)
   hbox = gimp_pattern_box_new (NULL, GIMP_CONTEXT (tool_options), 2);
   gimp_enum_radio_frame_add (GTK_FRAME (frame), hbox, GIMP_PATTERN_CLONE);
 
-  frame = gimp_prop_enum_radio_frame_new (config, "align-mode",
-                                          _("Alignment"),
-                                          0, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-  gtk_widget_show (frame);
+  table = gtk_table_new (1, 2, FALSE);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 2);
+  gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
+  gtk_widget_show (table);
+
+  combo = gimp_prop_enum_combo_box_new (config, "align-mode", 0, 0);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
+                             _("Alignment:"), 0.0, 0.5,
+                             combo, 1, FALSE);
 
   return vbox;
 }