diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index e5bb4dd8a10..a65323b0606 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -2322,23 +2322,26 @@ static void object_panel_object(Object *ob)
 	Group *group;
 	int a, xco, yco=0;
 	short dx= 33, dy= 30;
-
+	int is_libdata = object_is_libdata(ob);
 	block= uiNewBlock(&curarea->uiblocks, "object_panel_object", UI_EMBOSS, UI_HELV, curarea->win);
 	if(uiNewPanel(curarea, block, "Object and Links", "Object", 0, 0, 318, 204)==0) return;
 	
-	uiSetButLock(object_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
+	
 	
 	/* object name */
 	uiBlockSetCol(block, TH_BUT_SETTING2);
+	uiSetButLock(is_libdata, ERROR_LIBDATA_MESSAGE);
 	xco= std_libbuttons(block, 10, 180, 0, NULL, 0, ID_OB, 0, &ob->id, NULL, &(G.buts->menunr), B_OBALONE, B_OBLOCAL, 0, 0, B_KEEPDATA);
 	uiBlockSetCol(block, TH_AUTO);
 	
 	/* parent */
+	uiSetButLock(is_libdata, ERROR_LIBDATA_MESSAGE);
 	uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_OBJECTPANELPARENT, "Par:", xco+5, 180, 305-xco, 20, &ob->parent, "Parent Object"); 
 	
-	/* TODO, check for ob->id.lib */
+	uiSetButLock(is_libdata, ERROR_LIBDATA_MESSAGE);
 	but = uiDefButS(block, NUM, B_NOP, "PassIndex:",		xco+5, 150, 305-xco, 20, &ob->index, 0.0, 1000.0, 0, 0, "Index # for the IndexOB render pass.");
-
+	
+	uiSetButLock(1, NULL);
 	uiDefBlockBut(block, add_groupmenu, NULL, "Add to Group", 10,150,150,20, "Add Object to a new Group");
 
 	/* all groups */
diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c
index d4e41e56e75..d6bbedec2b3 100644
--- a/source/blender/src/filesel.c
+++ b/source/blender/src/filesel.c
@@ -1421,7 +1421,9 @@ static void filesel_execute(SpaceFile *sfile)
 		}
 
 		do_library_append(sfile);
-		BIF_undo_push("Append from file");
+		
+		BIF_undo_push( ((sfile->flag & FILE_LINK)==0) ? "Append from file" : "Link from file");
+		
 		allqueue(REDRAWALL, 1);
 	}
 	else if(filesel_has_func(sfile)) {