diff -urN pacemaker-1.1.ORG/shell/modules/cibconfig.py pacemaker-1.1.MOD/shell/modules/cibconfig.py
--- pacemaker-1.1.ORG/shell/modules/cibconfig.py	2011-05-12 11:13:54.000000000 +0900
+++ pacemaker-1.1.MOD/shell/modules/cibconfig.py	2011-05-12 10:33:48.814021045 +0900
@@ -321,6 +321,30 @@
     except: pass
     return []
 
+def replace_node_id(cli_list):
+    if not cli_list or cli_list[0][0] != "node":
+        return None
+    uname = find_value(cli_list[0][1],"uname")
+    id = find_value(cli_list[0][1],"id")
+    if uname and uname == id:
+        nodes = get_conf_elem(cibdump2doc("nodes"),"nodes")
+        if nodes:
+            common_debug("cli_list: %s"%cli_list)
+            for c in nodes.childNodes:
+                if (not is_element(c) or c.tagName != "node" or
+                    c.getAttribute("uname") != uname):
+                    continue
+                node_id = c.getAttribute("id").encode('ascii')
+                if not node_id:
+                    continue
+                for x in cli_list[0][1]:
+                    if x[0] == "id" and x[1] != node_id:
+                        common_debug("id_replace: <%s> to <%s>"%(x[1],node_id))
+                        x[1] = node_id
+                        common_debug("cli_list: %s"%cli_list)
+                        return node_id
+    return id
+
 class CibObjectSetCli(CibObjectSet):
     '''
     Edit or display a set of cib objects (using cli notation).
@@ -375,7 +399,7 @@
             err_buf.incr_lineno()
             cli_list = cp.parse(cli_text)
             if cli_list:
-                id = find_value(cli_list[0][1],"id")
+                id = replace_node_id(cli_list)
                 if id:
                     if id in id_list:
                         common_err("duplicate element %s" % id)
@@ -2060,6 +2084,7 @@
         if obj_type == "op":
             return self.add_op(cli_list)
         if obj_type == "node":
+            obj_id = replace_node_id(cli_list)
             obj = self.find_object(obj_id)
             # make an exception and allow updating nodes
             if obj:
