diff --git a/spring-js/scripts/dojo/README.txt b/spring-js/scripts/dojo/README.txt
new file mode 100644
index 00000000..d23b34e0
--- /dev/null
+++ b/spring-js/scripts/dojo/README.txt
@@ -0,0 +1,15 @@
+
+Use the script in this directory to upgrade the version of Dojo bundled with spring-js.
+
+Upgrade procedures:
+ 1) Open build.properties and modify the dojo.version property
+ 2) Run 'ant clean' from this directory 
+ 3) Run 'ant'
+ 4) Commit changes in build-spring-webflow/dojo-build directory
+
+Notes:
+Step 3) above creates a dojo-build.zip and copies it to build-spring-js/dojo-build.
+The file dojo-build.zip is then used during the spring-js build to bundle Dojo.
+
+
+
diff --git a/spring-js/scripts/dojo/build.properties b/spring-js/scripts/dojo/build.properties
new file mode 100644
index 00000000..fe15d9bf
--- /dev/null
+++ b/spring-js/scripts/dojo/build.properties
@@ -0,0 +1,4 @@
+
+dojo.version=1.2.4
+dojo.download.url=http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}-src.zip
+dojo.profile=standard.profile.js
diff --git a/spring-js/scripts/dojo/build.xml b/spring-js/scripts/dojo/build.xml
new file mode 100644
index 00000000..065bce63
--- /dev/null
+++ b/spring-js/scripts/dojo/build.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="dojo-build" default="build-and-copy">
+
+	<target name="init">
+		<property file="build.properties"/>
+		<property name="target.dir" value="${basedir}/target"/>
+		<property name="source.dir" value="${target.dir}/dojo-release-${dojo.version}-src"/>
+		<property name="buildscripts.dir" value="${source.dir}/util/buildscripts"/>
+		<property name="build.dir" value="${target.dir}/dojo-build"/>
+	</target>
+
+	<target name="clean" depends="init">
+		<delete dir="${target.dir}"/>
+	</target>
+	
+	<target name="download" depends="init" description="Download and unzip the Dojo Toolkit">
+
+		<mkdir dir="${target.dir}"/>
+
+		<get src="${dojo.download.url}" usetimestamp="true"
+			dest="${target.dir}/dojo-release-${dojo.version}-src.zip" />
+
+		<unzip src="${target.dir}/dojo-release-${dojo.version}-src.zip" dest="${source.dir}">
+			<mapper type="glob" from="dojo-release-${dojo.version}-src/*" to="*"/>
+		</unzip>
+
+	</target>
+
+	<target name="build-and-copy" depends="download" description="Prepare Dojo build optimized for use with spring-js">
+
+		<chmod file="${buildscripts.dir}/build.sh" perm="ugo+rx"/>
+
+		<exec executable="${buildscripts.dir}/build.sh" dir="${buildscripts.dir}/">
+		   <arg line="releaseDir=${build.dir}"/>
+		   <arg line="profileFile=${basedir}/${dojo.profile}"/>
+		   <arg line="releaseName="/>
+		   <arg line="copyTests=false"/>
+		   <arg line="action=release"/>
+		   <arg line="optimize=shrinksafe.keepLines"/>
+		   <arg line="cssOptimize=comments.keepLines"/>
+		   <arg line="cssImportIgnore=../dijit.css"/>
+		</exec>
+		
+		<zip destfile="${target.dir}/dojo-build.zip" basedir="${build.dir}"/>
+
+		<copy file="${target.dir}/dojo-build.zip" 
+			toFile="${basedir}/../../../build-spring-webflow/dojo-build/dojo-build.zip" />
+
+	</target>
+	
+</project>
diff --git a/spring-js/scripts/dojo/standard.profile.js b/spring-js/scripts/dojo/standard.profile.js
new file mode 100644
index 00000000..4750eeb7
--- /dev/null
+++ b/spring-js/scripts/dojo/standard.profile.js
@@ -0,0 +1,39 @@
+dependencies ={
+	//Strip all console.* calls except console.warn and console.error. This is basically a work-around
+	//for trac issue: http://bugs.dojotoolkit.org/ticket/6849 where Safari 3's console.debug seems
+	//to be flaky to set up (apparently fixed in a webkit nightly).
+	//But in general for a build, console.warn/error should be the only things to survive anyway.
+	stripConsole: "normal",
+
+    layers:  [
+        {
+		    name: "dojo.js",
+		    dependencies: [
+				"dijit.Dialog",
+				"dijit.form.CurrencyTextBox",
+				"dijit.form.DateTextBox"
+		    ]
+        },
+        
+        // Now add layers from Dojo's standard.profile.js
+
+		{
+			name: "../dijit/dijit.js",
+			dependencies: [
+				"dijit.dijit"
+			]
+		},
+		{
+			name: "../dijit/dijit-all.js",
+			layerDependencies: [
+				"../dijit/dijit.js"
+			],
+			dependencies: [
+				"dijit.dijit-all"
+			]
+		}
+    ],
+    prefixes: [
+        [ "dijit", "../dijit" ]
+    ]
+};