Index: trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 772)
+++ trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 773)
@@ -97,7 +97,8 @@
 					if (w.deleted || w.incomplete) continue;
 					int last = w.nodes.size()-1;
+					Boolean circular = w.nodes.get(0).equals(w.nodes.get(last));
 					int i = 0;
 					for (Node wn : w.nodes) {
-						if ((i > 0) && (i < last) && n.equals(wn)) {
+						if ((circular || (i > 0 && i < last)) && n.equals(wn)) {
 							Integer old = wayOccurenceCounter.get(w);
 							wayOccurenceCounter.put(w, (old == null) ? 1 : old+1);
@@ -130,5 +131,5 @@
 			}
 
-			// If a way and nodes are selected, verify that the nodes are part of the way.
+		// If a way and nodes are selected, verify that the nodes are part of the way.
 		} else if (selectedWay != null && selectedNodes != null) {
 
@@ -216,9 +217,12 @@
 
 		if (wayChunks.size() < 2) {
-			JOptionPane.showMessageDialog(Main.parent, tr("The way cannot be split at the selected nodes. (Hint: Select nodes in the middle of the way.)"));
+			if(wayChunks.get(0).get(0) == wayChunks.get(0).get(wayChunks.get(0).size()-1))
+				JOptionPane.showMessageDialog(Main.parent, tr("You must select two or more nodes to split a circular way."));
+			else
+				JOptionPane.showMessageDialog(Main.parent, tr("The way cannot be split at the selected nodes. (Hint: Select nodes in the middle of the way.)"));
 			return;
 		}
-		Main.debug("wayChunks.size(): " + wayChunks.size());
-		Main.debug("way id: " + selectedWay.id);
+		//Main.debug("wayChunks.size(): " + wayChunks.size());
+		//Main.debug("way id: " + selectedWay.id);
 
 		// build a list of commands, and also a new selection list
@@ -245,5 +249,5 @@
 			wayToAdd.nodes.addAll(chunkIt.next());
 			commandList.add(new AddCommand(wayToAdd));
-			Main.debug("wayToAdd: " + wayToAdd);
+			//Main.debug("wayToAdd: " + wayToAdd);
 			newSelection.add(wayToAdd);