diff --git a/changelog.html b/changelog.html
index 95abae95836f355d7ef53879a70b24f1a9733a74..957f9f3c06db444862c37a476c650856c40cc90f 100644
--- a/changelog.html
+++ b/changelog.html
@@ -76,6 +76,9 @@ Upcoming changes</a>
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18366">issue 18366</a>)
   <li class=rfe>
     "java -jar jenkins.war" gets the "--spdy" option to enable SPDY.
+  <li class=rfe>
+    Expand all/Collapse all functionality for artifact tree view.
+    (<a href="https://github.com/jenkinsci/jenkins/pull/616">pull request 616</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 
diff --git a/core/src/main/resources/lib/hudson/artifactList.jelly b/core/src/main/resources/lib/hudson/artifactList.jelly
index 4118c983928d9488b85002441147bc4a7c8a082f..92d6e0041826de7124389dbb02aceba62b70686d 100644
--- a/core/src/main/resources/lib/hudson/artifactList.jelly
+++ b/core/src/main/resources/lib/hudson/artifactList.jelly
@@ -76,13 +76,13 @@ THE SOFTWARE.
               <link rel="stylesheet" href="${resURL}/scripts/yui/treeview/assets/skins/sam/treeview.css" type="text/css"/>
               <link rel="stylesheet" href="${resURL}/scripts/yui/fonts/fonts-min.css" type="text/css"/>
               <style type="text/css">#artifact-tree td { vertical-align:middle; }</style>
-              <script>
-                function expandAll(){
-                YAHOO.widget.TreeView.getNode('artifact-tree',1).tree.expandAll();
-                }
-              </script>
+              <br/>
+              <small>
+                <a href="javascript: YAHOO.widget.TreeView.getNode('artifact-tree',1).tree.expandAll()">${%Expand all}</a>
+                <st:nbsp/>
+                <a href="javascript: YAHOO.widget.TreeView.getNode('artifact-tree',1).tree.collapseAll();">${%Collapse all}</a>
+              </small>
               <div id="artifact-tree"></div>
-              <a href="javascript: expandAll()">Expand all</a>
               <script language="javascript">// &lt;![CDATA[
                 YAHOO.util.Event.onContentReady('artifact-tree', function () {
                 var artifactTree = new YAHOO.widget.TreeView('artifact-tree');