diff --git a/spring-boot-tools/spring-boot-gradle-plugin/README.md b/spring-boot-tools/spring-boot-gradle-plugin/README.md
index 01381b54b52..b7ac04897af 100644
--- a/spring-boot-tools/spring-boot-gradle-plugin/README.md
+++ b/spring-boot-tools/spring-boot-gradle-plugin/README.md
@@ -52,6 +52,10 @@ To run a project in place without building a jar first you can use the "bootRun"
 $ gradle bootRun
 ```
 
+Running this way makes your static classpath resources (i.e. in
+`src/main/resources` by default) reloadable in the live application,
+which can be helpful at development time.
+
 ### Repackage configuration
 The gradle plugin automatically extends your build script DSL with a `springBoot` element
 for configuration. Simply set the appropriate properties as you would any other gradle
@@ -116,6 +120,7 @@ The following configuration options are available:
 | providedConfiguration | String  | The name of the provided configuration                                                                                                                                     | providedRuntime |
 | backupSource          | boolean | If the original source archive should be backed-up before being repackaged                                                                                                 | true            |
 | customConfiguration | String  | The name of the custom configuration                                                                                                                                         | none            |
+| layout          | String | The type of archive (which corresponds to how the dependencies are layed out inside it). Defaults to a guess based on the archive type. |
 
 ## Further Reading
 For more information on how Spring Boot Loader archives work, take a look at the
diff --git a/spring-boot-tools/spring-boot-maven-plugin/README.md b/spring-boot-tools/spring-boot-maven-plugin/README.md
index a4231181c74..aa39bd7ddd7 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/README.md
+++ b/spring-boot-tools/spring-boot-maven-plugin/README.md
@@ -97,7 +97,6 @@ $ mvn package
 $ java -jar target/mymodule-0.0.1-SNAPSHOT.jar
 ```
 
-
 ### Repackage configuration
 The following configuration options are available for the `spring-boot:repackage` goal:
 
@@ -115,7 +114,34 @@ The following configuration options are available for the `spring-boot:repackage
 |-----------------|--------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | classifier      | String | Classifier to add to the artifact generated. If given, the artifact will be attached. If this is not given, it will merely be written to the output directory according to the finalName |
 | mainClass       | String | The name of the main class. If not specified the first compiled class found that contains a 'main' method will be used                                                                   |
-
+| layout          | String | The type of archive (which corresponds to how the dependencies are layed out inside it). Defaults to a guess based on the archive type. |
+
+The plugin rewrites your manifest, and in particular it manages the
+`Main-Class` and `Start-Class` entries, so if the defaults don't work
+you have to configure those there (not in the jar plugin). The
+`Main-Class` in the manifest is actually controlled by the `layout`
+property of the boot plugin, e.g.
+
+    <plugin>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-maven-plugin</artifactId>
+      <version>{{project.version}}</version>
+      <configuration>
+        <mainClass>${start-class}</mainClass>
+        <layout>ZIP</layout>
+      </configuration>
+      <executions>
+        <execution>
+          <goals>
+            <goal>repackage</goal>
+          </goals>
+        </execution>
+      </executions>
+    </plugin>
+
+The layout property defaults to a guess based on the archive type (JAR
+or WAR). For the `PropertiesLauncher` the layout is "ZIP" (even though
+the output might be a JAR file).
 
 ## Running applications
 The Spring Boot Maven Plugin includes a `run` goal which can be used to launch your