--- old/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java	2015-12-16 15:53:42.059891600 +0530
+++ new/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java	2015-12-16 15:53:41.644867900 +0530
@@ -206,6 +206,7 @@
                         // These could be "null" if values are not supplied,
                         // in which case we have to use the default values.
                         private String  name;
+                        private String  documentation;
                         private Integer attributes;
                         private Integer arity;
                         private Where   where;
@@ -222,6 +223,13 @@
                                     name = null;
                                 }
                                 break;
+                            case "documentation":
+                                this.documentation = (String)annotationValue;
+                                if (documentation.isEmpty()) {
+                                    documentation = null;
+                                }
+
+                                break;
                             case "attributes":
                                 this.attributes = (Integer)annotationValue;
                                 break;
@@ -270,6 +278,8 @@
                             } else {
                                 memInfo.setName(name == null ? methodName : name);
                             }
+
+                            memInfo.setDocumentation(documentation);
                             memInfo.setAttributes(attributes == null ? MemberInfo.DEFAULT_ATTRIBUTES : attributes);
 
                             memInfo.setArity((arity == null)? MemberInfo.DEFAULT_ARITY : arity);