diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index 19c3fcf..d983ffb 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -9,6 +9,9 @@
 	if (!doc.__islocal && doc.docstatus<2) {
 		cur_frm.add_custom_button(__("Update Cost"), cur_frm.cscript.update_cost,
 			"icon-money", "btn-default");
+		
+		cur_frm.add_custom_button(__("Update Item"), cur_frm.cscript.update_item_desc,
+			"icon-tag", "btn-default");
 	}
 
 	cur_frm.cscript.with_operations(doc);
@@ -25,6 +28,16 @@
 	})
 }
 
+cur_frm.cscript.update_item_desc = function() {
+	return frappe.call({
+		doc: cur_frm.doc,
+		method: "update_item_desc",
+		callback: function(r) {
+			if(!r.exc) cur_frm.refresh_fields();
+		}
+	})
+}
+
 cur_frm.cscript.with_operations = function(doc) {
 	cur_frm.fields_dict["items"].grid.set_column_disp("operation", doc.with_operations);
 	cur_frm.fields_dict["items"].grid.toggle_reqd("operation", doc.with_operations);
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 636d86b..2917e6d 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -132,6 +132,16 @@
 			self.ignore_validate_update_after_submit = True
 			self.calculate_cost()
 		self.save()
+		
+	def update_item_desc(self):
+		if self.docstatus == 1:
+			self.ignore_validate_update_after_submit = True
+			self.description = frappe.db.get_value("Item", self.item, "description")
+			for d in self.get("items"):
+				d.description = frappe.db.get_value("Item", d.item_code, "description")
+			for d in self.get("exploded_items"):
+				d.description = frappe.db.get_value("Item", d.item_code, "description")
+			self.save()
 
 	def get_bom_unitcost(self, bom_no):
 		bom = frappe.db.sql("""select name, total_cost/quantity as unit_cost from `tabBOM`
