diff --git a/core/pom.xml b/core/pom.xml
index 29f777bab8..e8cf323005 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -382,7 +382,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler-jelly</artifactId>
-      <version>1.155</version>
+      <version>1.157</version>
       <exclusions>
         <exclusion>
           <groupId>commons-jelly</groupId>
diff --git a/ui-samples-plugin/src/main/java/hudson/plugins/ui_samples/JavaScriptProxy.java b/ui-samples-plugin/src/main/java/hudson/plugins/ui_samples/JavaScriptProxy.java
new file mode 100644
index 0000000000..33a90f6d54
--- /dev/null
+++ b/ui-samples-plugin/src/main/java/hudson/plugins/ui_samples/JavaScriptProxy.java
@@ -0,0 +1,32 @@
+package hudson.plugins.ui_samples;
+
+import hudson.Extension;
+import org.kohsuke.stapler.bind.JavaScriptMethod;
+
+/**
+ * "Export" Java objects to JavaScript in the browser as a proxy object, so that
+ * you can make ajax-calls to the server later.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@Extension
+public class JavaScriptProxy extends UISample {
+    private int i;
+    
+    @Override
+    public String getDescription() {
+        return "Use JavaScript proxy objects to access server-side Java objects from inside the browser.";
+    }
+
+    /**
+     * The annotation exposes this method to JavaScript proxy.
+     */
+    @JavaScriptMethod
+    public int increment(int n) {
+        return i+=n;
+    }
+
+    @Extension
+    public static final class DescriptorImpl extends UISampleDescriptor {
+    }
+}
diff --git a/ui-samples-plugin/src/main/resources/hudson/plugins/ui_samples/JavaScriptProxy/index.jelly b/ui-samples-plugin/src/main/resources/hudson/plugins/ui_samples/JavaScriptProxy/index.jelly
new file mode 100644
index 0000000000..7192bbca48
--- /dev/null
+++ b/ui-samples-plugin/src/main/resources/hudson/plugins/ui_samples/JavaScriptProxy/index.jelly
@@ -0,0 +1,45 @@
+<!--
+The MIT License
+
+Copyright (c) 2011, CloudBees, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:s="/lib/samples">
+  <s:sample title="AJAX with JavaScript Proxy">
+    <p>
+      In Jenkins, you can export arbitrary server-side Java object to JavaScript via a proxy,
+      then invoke their methods from JavaScript. See <a href="http://wiki.jenkins-ci.org/display/JENKINS/AJAX+with+JavaScript+proxy">the Wiki</a> for more details.
+      In this sample, we call a method on the server to increment a counter. This object is a singleton,
+      so you'll see the same counter value across all the browsers.
+    </p>
+
+    <st:bind var="a" value="${it}"/>
+
+    <div id="msg" />
+    <script>
+      window.setInterval(function () {
+        a.increment(1, function(t) {
+          document.getElementById('msg').innerHTML = t.responseObject();
+        })
+      },1000);
+    </script>
+  </s:sample>
+</j:jelly>