Index: generic/nsf.c
===================================================================
diff -u -r265965e7feb81522a3fdf5d29e4883846abe77cb -rc4997e0189bb712287aa53d12bb3e332acfb781d
--- generic/nsf.c	(.../nsf.c)	(revision 265965e7feb81522a3fdf5d29e4883846abe77cb)
+++ generic/nsf.c	(.../nsf.c)	(revision c4997e0189bb712287aa53d12bb3e332acfb781d)
@@ -16595,12 +16595,12 @@
     }
 
     switch (subcmd) {
-    case InfomethodsubcmdHandleIdx:
+    case InfomethodsubcmdRegistrationhandleIdx:
       {
 	Tcl_SetObjResult(interp, MethodHandleObj(regObject, withPer_object, methodName));
 	return TCL_OK;
       }
-    case InfomethodsubcmdOriginIdx:
+    case InfomethodsubcmdDefinitionhandleIdx:
       {
 	Tcl_SetObjResult(interp, MethodHandleObj(defObject, 
 						 NsfObjectIsClass(defObject) ? withPer_object : 1, 
@@ -16850,6 +16850,14 @@
             Tcl_SetObjResult(interp, resultObj);
             break;
           }
+	case InfomethodsubcmdOriginIdx:
+	  {
+            int nrElements;
+            Tcl_Obj **listElements;
+            Tcl_ListObjGetElements(interp, entryObj, &nrElements, &listElements);
+            Tcl_SetObjResult(interp, listElements[nrElements-1]);
+            break;
+          }
         }
       } else {
 	/* check, to be on the safe side */
@@ -21837,7 +21845,7 @@
     NsfObject *pobj = pcl ? &pcl->object : object;
     int perObject = (pcl == NULL);
 
-    ListMethod(interp, pobj, pobj, ObjStr(methodObj), cmd, InfomethodsubcmdHandleIdx, perObject);
+    ListMethod(interp, pobj, pobj, ObjStr(methodObj), cmd, InfomethodsubcmdRegistrationhandleIdx, perObject);
   }
   return TCL_OK;
 }
@@ -21996,7 +22004,7 @@
 
 /*
 objectInfoMethod method NsfObjInfoMethodMethod {
-  {-argName "infomethodsubcmd" -type "args|body|exists|definition|handle|origin|parameter|parametersyntax|type|precondition|postcondition|subcommands"}
+  {-argName "infomethodsubcmd" -type "args|body|definition|exists|registrationhandle|definitionhandle|origin|parameter|parametersyntax|type|precondition|postcondition|submethods"}
   {-argName "name" -required 1 -type tclobj}
 }
 */
@@ -22292,7 +22300,7 @@
 
 /*
 classInfoMethod method NsfClassInfoMethodMethod {
-  {-argName "infomethodsubcmd" -type "args|body|exists|definition|handle|origin|parameter|parametersyntax|type|precondition|postcondition|subcommands"}
+  {-argName "infomethodsubcmd" -type "args|body|definition|exists|registrationhandle|definitionhandle|origin|parameter|parametersyntax|type|precondition|postcondition|submethods"}
   {-argName "name" -required 1 -type tclobj}
 }
 */