Index: /src/org/openstreetmap/josm/actions/mapmode/MoveAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/mapmode/MoveAction.java	(revision 310)
+++ /src/org/openstreetmap/josm/actions/mapmode/MoveAction.java	(revision 311)
@@ -14,6 +14,9 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.GroupAction;
+import org.openstreetmap.josm.actions.mapmode.AddNodeAction.Mode;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.MoveCommand;
+import org.openstreetmap.josm.command.RotateCommand;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
@@ -35,4 +38,18 @@
  */
 public class MoveAction extends MapMode implements SelectionEnded {
+	
+	enum Mode {move, rotate}
+	private final Mode mode;
+
+	public static class MoveGroup extends GroupAction {
+		public MoveGroup(MapFrame mf) {
+			super(KeyEvent.VK_M,0);
+			putValue("help", "Action/Move");
+			actions.add(new MoveAction(mf, tr("Move"), Mode.move, tr("Move around objects that are under the mouse or selected.")));
+			actions.add(new MoveAction(mf, tr("Rotate"), Mode.rotate, tr("Rotate selected nodes around centre")));
+			setCurrent(0);
+		}
+	}
+	
 	/**
 	 * The old cursor before the user pressed the mouse button.
@@ -50,14 +67,19 @@
 	 * @param mapFrame The MapFrame, this action belongs to.
 	 */
-	public MoveAction(MapFrame mapFrame) {
-		super(tr("Move"), 
-				"move",
-				tr("Move around objects that are under the mouse or selected."), 
-				KeyEvent.VK_M,
-				mapFrame,
-				ImageProvider.getCursor("normal", "move"));
+	public MoveAction(MapFrame mapFrame, String name, Mode mode, String desc) {
+		super(name, "move/"+mode, desc, mapFrame, getCursor());
+		this.mode = mode;
+		putValue("help", "Action/Move/"+Character.toUpperCase(mode.toString().charAt(0))+mode.toString().substring(1));
 		selectionManager = new SelectionManager(this, false, mapFrame.mapView);
 	}
 
+	private static Cursor getCursor() {
+		try {
+	        return ImageProvider.getCursor("crosshair", null);
+        } catch (Exception e) {
+        }
+	    return Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR);
+    }
+	
 	@Override public void enterMode() {
 		super.enterMode();
@@ -72,5 +94,4 @@
 	}
 
-
 	/**
 	 * If the left mouse button is pressed, move all currently selected
@@ -87,5 +108,5 @@
 		if (mousePos == null)
 			mousePos = e.getPoint();
-
+		
 		EastNorth mouseEN = Main.map.mapView.getEastNorth(e.getX(), e.getY());
 		EastNorth mouseStartEN = Main.map.mapView.getEastNorth(mousePos.x, mousePos.y);
@@ -97,4 +118,9 @@
 		Collection<OsmPrimitive> selection = Main.ds.getSelected();
 		Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
+		
+		// when rotating, having only one node makes no sense - quit silently
+		if (affectedNodes.size() < 2 && mode == Mode.move) 
+			return;
+		
 
 		// check if any coordinate would be outside the world
@@ -105,10 +131,17 @@
 			}
 		}
-
 		Command c = !Main.main.undoRedo.commands.isEmpty() ? Main.main.undoRedo.commands.getLast() : null;
-		if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).objects))
-			((MoveCommand)c).moveAgain(dx,dy);
-		else
-			Main.main.undoRedo.add(new MoveCommand(selection, dx, dy));
+
+		if (mode == Mode.move) {
+			if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).objects))
+				((MoveCommand)c).moveAgain(dx,dy);
+			else
+				Main.main.undoRedo.add(new MoveCommand(selection, dx, dy));
+		} else if (mode == Mode.rotate) {
+			if (c instanceof RotateCommand && affectedNodes.equals(((RotateCommand)c).objects))
+				((RotateCommand)c).rotateAgain(mouseStartEN, mouseEN);
+			else
+				Main.main.undoRedo.add(new RotateCommand(selection, mouseStartEN, mouseEN));
+		}
 
 		Main.map.mapView.repaint();
@@ -135,5 +168,10 @@
 				Main.ds.setSelected(osm);
 			oldCursor = Main.map.mapView.getCursor();
-			Main.map.mapView.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+			
+			if (mode == Mode.move) {
+				Main.map.mapView.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+			} else {
+				Main.map.mapView.setCursor(ImageProvider.getCursor("rotate", null));
+			}
 		} else {
 			selectionMode = true;
Index: /src/org/openstreetmap/josm/command/RotateCommand.java
===================================================================
--- /src/org/openstreetmap/josm/command/RotateCommand.java	(revision 311)
+++ /src/org/openstreetmap/josm/command/RotateCommand.java	(revision 311)
@@ -0,0 +1,151 @@
+package org.openstreetmap.josm.command;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.JLabel;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.MutableTreeNode;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.MoveCommand.OldState;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.visitor.AllNodesVisitor;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * RotateCommand rotates a number of objects around their centre.
+ * 
+ * @author Frederik Ramm <frederik@remote.org>
+ */
+public class RotateCommand extends Command {
+	
+	/**
+	 * The objects to rotate.
+	 */
+	public Collection<Node> objects = new LinkedList<Node>();
+	
+	/**
+	 * pivot point
+	 */
+	private Node pivot;
+	
+	/**
+	 * angle of rotation starting click to pivot
+	 */
+	private double startAngle;
+	
+	/**
+	 * computed rotation angle between starting click and current mouse pos
+	 */
+	private double rotationAngle;
+	
+	/**
+	 * Small helper for holding the interesting part of the old data state of the
+	 * objects. 
+	 */
+	class OldState
+	{
+		double x,y,lat,lon;
+		boolean modified;
+		Node originalNode;
+	}
+	
+	/**
+	 * List of all old states of the objects.
+	 */
+	private Map<Node, OldState> oldState = new HashMap<Node, OldState>();
+	
+	/**
+	 * Creates a RotateCommand.
+	 * Assign the initial object set, compute pivot point and rotation angle.
+	 * Computation of pivot point is done by the same rules that are used in 
+	 * the "align nodes in circle" action.
+	 */
+	public RotateCommand(Collection<OsmPrimitive> objects, EastNorth start, EastNorth end) {
+
+		this.objects = AllNodesVisitor.getAllNodes(objects);
+		pivot = new Node(new LatLon(0,0));
+			
+		for (Node n : this.objects) {
+			OldState os = new OldState();
+			os.x = n.eastNorth.east();
+			os.y = n.eastNorth.north();
+			os.lat = n.coor.lat();
+			os.lon = n.coor.lon();
+			os.modified = n.modified;
+			oldState.put(n, os);
+			pivot.eastNorth = new EastNorth(pivot.eastNorth.east()+os.x, pivot.eastNorth.north()+os.y);
+			pivot.coor = Main.proj.eastNorth2latlon(pivot.eastNorth);
+		}
+		pivot.eastNorth = new EastNorth(pivot.eastNorth.east()/this.objects.size(), pivot.eastNorth.north()/this.objects.size());
+		pivot.coor = Main.proj.eastNorth2latlon(pivot.eastNorth);	
+
+		rotationAngle = Math.PI/2;
+		rotateAgain(start, end);
+	}
+
+	/**
+	 * Rotate the same set of objects again, by the angle between given 
+	 * start and end nodes. Internally this is added to the existing
+	 * rotation so a later undo will undo the whole rotation.
+	 */
+	public void rotateAgain(EastNorth start, EastNorth end) {
+		// compute angle
+		startAngle = Math.atan2(start.east()-pivot.eastNorth.east(), start.north()-pivot.eastNorth.north());
+		double endAngle = Math.atan2(end.east()-pivot.eastNorth.east(), end.north()-pivot.eastNorth.north());
+		rotationAngle += startAngle - endAngle;		
+		rotateNodes(false);
+	}
+	
+	/**
+	 * Helper for actually rotationg the nodes.
+	 * @param setModified - true if rotated nodes should be flagged "modified"
+	 */
+	private void rotateNodes(boolean setModified) {
+		for (Node n : objects) {
+			double cosPhi = Math.cos(rotationAngle);
+			double sinPhi = Math.sin(rotationAngle);
+			double x = oldState.get(n).x - pivot.eastNorth.east();
+			double y = oldState.get(n).y - pivot.eastNorth.north();
+			double nx =  sinPhi * x + cosPhi * y + pivot.eastNorth.east();
+			double ny = -cosPhi * x + sinPhi * y + pivot.eastNorth.north();
+			n.eastNorth = new EastNorth(nx, ny);
+			n.coor = Main.proj.eastNorth2latlon(n.eastNorth);
+			if (setModified) n.modified = true;
+		}
+	}
+	
+	@Override public void executeCommand() {
+		rotateNodes(true);
+	}
+
+	@Override public void undoCommand() {
+		for (Node n : objects) {
+			OldState os = oldState.get(n);
+			n.eastNorth = new EastNorth(os.x, os.y);
+			n.coor = new LatLon(os.lat, os.lon);
+			n.modified = os.modified;
+		}
+	}
+
+	@Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
+		for (OsmPrimitive osm : objects)
+			modified.add(osm);
+	}
+
+	@Override public MutableTreeNode description() {
+		return new DefaultMutableTreeNode(new JLabel(tr("Rotate")+" "+objects.size()+" "+trn("node","nodes",objects.size()), ImageProvider.get("data", "node"), JLabel.HORIZONTAL));
+    }
+}
Index: /src/org/openstreetmap/josm/gui/MapFrame.java
===================================================================
--- /src/org/openstreetmap/josm/gui/MapFrame.java	(revision 310)
+++ /src/org/openstreetmap/josm/gui/MapFrame.java	(revision 311)
@@ -22,4 +22,5 @@
 import org.openstreetmap.josm.actions.mapmode.ZoomAction;
 import org.openstreetmap.josm.actions.mapmode.AddNodeAction.AddNodeGroup;
+import org.openstreetmap.josm.actions.mapmode.MoveAction.MoveGroup;
 import org.openstreetmap.josm.gui.dialogs.CommandStackDialog;
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
@@ -82,5 +83,5 @@
 		final Action selectionAction = new SelectionAction.Group(this);
 		toolBarActions.add(new IconToggleButton(selectionAction));
-		toolBarActions.add(new IconToggleButton(new MoveAction(this)));
+		toolBarActions.add(new IconToggleButton(new MoveGroup(this)));
 		toolBarActions.add(new IconToggleButton(new AddNodeGroup(this)));
 		toolBarActions.add(new IconToggleButton(new AddSegmentAction(this)));