diff --git a/ChangeLog b/ChangeLog
index 8bd3b1142e..e511ba45a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-13  Michael Natterer  <mitch@gimp.org>
+
+	* app/measure.c: push an undo group when adding horizontal and
+	vertical guides with Ctrl+Alt.
+
 2000-04-12  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/common/gif.c: use GIMP_HAVE_PARASITES instead of
diff --git a/app/measure.c b/app/measure.c
index 555ae89f77..7bdfbb81c7 100644
--- a/app/measure.c
+++ b/app/measure.c
@@ -208,6 +208,11 @@ measure_tool_button_press (Tool           *tool,
 		{
 		  Guide *guide;
 
+		  if (bevent->state & GDK_CONTROL_MASK &&
+		      bevent->state & GDK_MOD1_MASK &&
+		      (measure_tool->y[i] == CLAMP (measure_tool->y[i], 0, gdisp->gimage->height)))
+		    undo_push_group_start (gdisp->gimage, GUIDE_UNDO);
+
 		  if (bevent->state & GDK_CONTROL_MASK && 
 		      (measure_tool->y[i] == CLAMP (measure_tool->y[i], 0, gdisp->gimage->height)))
 		    {
@@ -224,6 +229,12 @@ measure_tool_button_press (Tool           *tool,
 		      guide->position = measure_tool->x[i];
 		      gdisplays_expose_guide (gdisp->gimage, guide);
 		    }
+
+		  if (bevent->state & GDK_CONTROL_MASK &&
+		      bevent->state & GDK_MOD1_MASK &&
+		      (measure_tool->y[i] == CLAMP (measure_tool->y[i], 0, gdisp->gimage->height)))
+		    undo_push_group_end (gdisp->gimage);
+
 		  gdisplays_flush ();
 		  measure_tool->function = GUIDING;
 		  break;
diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c
index 555ae89f77..7bdfbb81c7 100644
--- a/app/tools/gimpmeasuretool.c
+++ b/app/tools/gimpmeasuretool.c
@@ -208,6 +208,11 @@ measure_tool_button_press (Tool           *tool,
 		{
 		  Guide *guide;
 
+		  if (bevent->state & GDK_CONTROL_MASK &&
+		      bevent->state & GDK_MOD1_MASK &&
+		      (measure_tool->y[i] == CLAMP (measure_tool->y[i], 0, gdisp->gimage->height)))
+		    undo_push_group_start (gdisp->gimage, GUIDE_UNDO);
+
 		  if (bevent->state & GDK_CONTROL_MASK && 
 		      (measure_tool->y[i] == CLAMP (measure_tool->y[i], 0, gdisp->gimage->height)))
 		    {
@@ -224,6 +229,12 @@ measure_tool_button_press (Tool           *tool,
 		      guide->position = measure_tool->x[i];
 		      gdisplays_expose_guide (gdisp->gimage, guide);
 		    }
+
+		  if (bevent->state & GDK_CONTROL_MASK &&
+		      bevent->state & GDK_MOD1_MASK &&
+		      (measure_tool->y[i] == CLAMP (measure_tool->y[i], 0, gdisp->gimage->height)))
+		    undo_push_group_end (gdisp->gimage);
+
 		  gdisplays_flush ();
 		  measure_tool->function = GUIDING;
 		  break;
diff --git a/app/tools/measure.c b/app/tools/measure.c
index 555ae89f77..7bdfbb81c7 100644
--- a/app/tools/measure.c
+++ b/app/tools/measure.c
@@ -208,6 +208,11 @@ measure_tool_button_press (Tool           *tool,
 		{
 		  Guide *guide;
 
+		  if (bevent->state & GDK_CONTROL_MASK &&
+		      bevent->state & GDK_MOD1_MASK &&
+		      (measure_tool->y[i] == CLAMP (measure_tool->y[i], 0, gdisp->gimage->height)))
+		    undo_push_group_start (gdisp->gimage, GUIDE_UNDO);
+
 		  if (bevent->state & GDK_CONTROL_MASK && 
 		      (measure_tool->y[i] == CLAMP (measure_tool->y[i], 0, gdisp->gimage->height)))
 		    {
@@ -224,6 +229,12 @@ measure_tool_button_press (Tool           *tool,
 		      guide->position = measure_tool->x[i];
 		      gdisplays_expose_guide (gdisp->gimage, guide);
 		    }
+
+		  if (bevent->state & GDK_CONTROL_MASK &&
+		      bevent->state & GDK_MOD1_MASK &&
+		      (measure_tool->y[i] == CLAMP (measure_tool->y[i], 0, gdisp->gimage->height)))
+		    undo_push_group_end (gdisp->gimage);
+
 		  gdisplays_flush ();
 		  measure_tool->function = GUIDING;
 		  break;