diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java b/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java
index 15b60f2a57..750272622d 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java
@@ -48,6 +48,8 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
+import gnu.trove.list.array.TLongArrayList;
+
 public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 
 	private static final long NO_CHANGESET_ID = -1;
@@ -242,6 +244,7 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 		}
 		ser.attribute(null, "changeset", changeSetId + ""); //$NON-NLS-1$ //$NON-NLS-2$
 
+		writeNodesIds(way, ser);
 		writeTags(way, ser);
 		ser.endTag(null, "way"); //$NON-NLS-1$
 	}
@@ -260,6 +263,18 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 		}
 	}
 
+	private void writeNodesIds(Way way, XmlSerializer ser)
+			throws IllegalArgumentException, IllegalStateException, IOException {
+		for (int i = 0; i < way.getNodeIds().size(); i++) {
+			long nodeId = way.getNodeIds().get(i);
+			if (nodeId != 0) {
+				ser.startTag(null, "nd"); //$NON-NLS-1$
+				ser.attribute(null, "ref", String.valueOf(nodeId)); //$NON-NLS-1$
+				ser.endTag(null, "nd"); //$NON-NLS-1$
+			}
+		}
+	}
+
 	private boolean isNewChangesetRequired() {
 		// first commit
 		if (changeSetId == NO_CHANGESET_ID) {
@@ -383,7 +398,19 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 					}
 				}
 				n.replaceTags(updatedTags);
-				if (!isWay && MapUtils.getDistance(n.getLatLon(), entity.getLatLon()) < 10) {
+				if (isWay) {
+					Way foundWay = (Way) entity;
+					Way currentWay = (Way) n;
+					TLongArrayList nodeIds = foundWay.getNodeIds();
+					if (nodeIds != null) {
+						for (int i = 0; i < nodeIds.size(); i++) {
+							long nodeId = nodeIds.get(i);
+							if (nodeId != 0) {
+								currentWay.addNode(nodeId);
+							}
+						}
+					}
+				} else if (MapUtils.getDistance(n.getLatLon(), entity.getLatLon()) < 10) {
 					// avoid shifting due to round error
 					n.setLatitude(entity.getLatitude());
 					n.setLongitude(entity.getLongitude());