diff --git a/spring-boot-cli/src/main/assembly/descriptor.xml b/spring-boot-cli/src/main/assembly/descriptor.xml
index 6f6608bb6a..beac4ee7d0 100644
--- a/spring-boot-cli/src/main/assembly/descriptor.xml
+++ b/spring-boot-cli/src/main/assembly/descriptor.xml
@@ -9,8 +9,15 @@
 	<includeBaseDirectory>true</includeBaseDirectory>
 	<fileSets>
 		<fileSet>
-			<directory>src/main/scripts</directory>
-			<outputDirectory>bin</outputDirectory>
+			<directory>src/main/content</directory>
+			<outputDirectory>/</outputDirectory>
+			<useDefaultExcludes>true</useDefaultExcludes>
+			<fileMode>644</fileMode>
+			<directoryMode>755</directoryMode>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/executablecontent</directory>
+			<outputDirectory>/</outputDirectory>
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<fileMode>755</fileMode>
 			<directoryMode>755</directoryMode>
diff --git a/spring-boot-cli/src/main/content/INSTALL.txt b/spring-boot-cli/src/main/content/INSTALL.txt
new file mode 100644
index 0000000000..42d6045f81
--- /dev/null
+++ b/spring-boot-cli/src/main/content/INSTALL.txt
@@ -0,0 +1,35 @@
+SPRING BOOT CLI - INSTALLATION
+==============================
+
+Thank you for downloading the Spring Boot CLI tool. Please follow these instructions
+in order to complete your installation.
+
+
+Prerequisites
+-------------
+Spring Boot CLI requires Java JDK v1.6 or above in order to run. Groovy v2.1 is packaged
+as part of this distribution, and therefore does not need to be installed (any existing
+Groovy installation is ignored).
+
+The CLI will use whatever JDK it finds on your path, to check that you have an appropriate
+version you should run:
+
+	java -version
+
+Alternatively, you can set the JAVA_HOME environment variable to point an suitable JDK.
+
+
+Environment Variables
+---------------------
+No specific environment variables are required to run the CLI, however, you may want to
+set SPRING_HOME to point to a specific installation.  You should also add SPRING_HOME/bin
+to your PATH environment variable.
+
+
+Checking Your Installation
+--------------------------
+To test if you have successfully install the CLI you can run the following command:
+
+	spring --version
+
+
diff --git a/spring-boot-cli/src/main/content/LICENCE.txt b/spring-boot-cli/src/main/content/LICENCE.txt
new file mode 100644
index 0000000000..78947af380
--- /dev/null
+++ b/spring-boot-cli/src/main/content/LICENCE.txt
@@ -0,0 +1,14 @@
+Copyright 2012-2013 the original author or authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
diff --git a/spring-boot-cli/src/main/scripts/spring.bat b/spring-boot-cli/src/main/content/bin/spring.bat
similarity index 100%
rename from spring-boot-cli/src/main/scripts/spring.bat
rename to spring-boot-cli/src/main/content/bin/spring.bat
diff --git a/spring-boot-cli/src/main/scripts/spring b/spring-boot-cli/src/main/executablecontent/bin/spring
similarity index 100%
rename from spring-boot-cli/src/main/scripts/spring
rename to spring-boot-cli/src/main/executablecontent/bin/spring