diff --git a/README.md b/README.md
index 4b85cfad88..be7ae91976 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ To **skip the basics**, do the following:
 <a name="scratch"></a>
 Set up the project
 ------------------
-First you set up a basic build script. You can use any build system you like when building apps with Spring, but the code you need to work with [Maven](https://maven.apache.org) and [Gradle](http://gradle.org) is included here. If you're not familiar with either, refer to [Building Java Projects with Maven](/guides/gs/maven/content) or [Building Java Projects with Gradle](/guides/gs/gradle/content).
+First you set up a basic build script. You can use any build system you like when building apps with Spring, but the code you need to work with [Maven](https://maven.apache.org) and [Gradle](http://gradle.org) is included here. If you're not familiar with either, refer to [Building Java Projects with Maven](/guides/gs/maven/) or [Building Java Projects with Gradle](/guides/gs/gradle/).
 
 ### Create the directory structure
 
@@ -99,7 +99,7 @@ In a project directory of your choosing, create the following subdirectory struc
 </project>
 ```
 
-This guide is using [Spring Boot's starter POMs](/guides/gs/spring-boot/content).
+This guide is using [Spring Boot's starter POMs](/guides/gs/spring-boot/).
 
 Note to experienced Maven users who are unaccustomed to using an external parent project: you can take it out later, it's just there to reduce the amount of code you have to write to get started.
 
@@ -457,7 +457,7 @@ $ mvn package
 
 [spring-boot-maven-plugin]: https://github.com/SpringSource/spring-boot/tree/master/spring-boot-maven-plugin
 
-> **Note:** The procedure above will create a runnable JAR. You can also opt to [build a classic WAR file](/guides/gs/convert-jar-to-war/content) instead.
+> **Note:** The procedure above will create a runnable JAR. You can also opt to [build a classic WAR file](/guides/gs/convert-jar-to-war/) instead.
 
 Run the batch job
 -------------------
diff --git a/SIDEBAR.md b/SIDEBAR.md
index 123eebb02c..6c77ff22a4 100644
--- a/SIDEBAR.md
+++ b/SIDEBAR.md
@@ -10,11 +10,11 @@ There's more to data integration than is covered here. You may want to continue
 * [Messaging with RabbitMQ][gs-messaging-rabbitmq]
 * [Messaging with Redis][gs-messaging-redis]
 
-[gs-integration]: /guides/gs/integration/content
-[gs-capturing-stream-data]: /guides/gs/capturing-stream-data/content
-[gs-messaging-jms]: /guides/gs/messaging-jms/content
-[gs-messaging-rabbitmq]: /guides/gs/messaging-rabbitmq/content
-[gs-messaging-redis]: /guides/gs/messaging-redis/content
+[gs-integration]: /guides/gs/integration/
+[gs-capturing-stream-data]: /guides/gs/capturing-stream-data/
+[gs-messaging-jms]: /guides/gs/messaging-jms/
+[gs-messaging-rabbitmq]: /guides/gs/messaging-rabbitmq/
+[gs-messaging-redis]: /guides/gs/messaging-redis/
 
 ### Tutorials