diff --git a/README.md b/README.md
index 982ccaee34..8ed742d69e 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,7 @@ Read news, hints and tips on the [news][] page.
 The easiest way to get started using ExoPlayer is by including the following in
 your project's `build.gradle` file:
 
-```
-gradle
+```gradle
 compile 'com.google.android.exoplayer:exoplayer:rX.X.X'
 ```
 
@@ -47,8 +46,7 @@ project's [Releases][]. For more details, see the project on [Bintray][].
 ExoPlayer can also be built from source using Gradle. You can include it as a
 dependent project like so:
 
-```
-gradle
+```gradle
 // settings.gradle
 include ':app', ':..:ExoPlayer:library'
 
@@ -62,8 +60,7 @@ dependencies {
 
 If you want to use ExoPlayer as a jar, run:
 
-```
-sh
+```sh
 ./gradlew jarRelease
 ```
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index efa081578d..1110752b9a 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,16 @@
 # Release notes #
 
+### r1.5.6 ###
+
+* MP3: Fix mono streams playing at 2x speed on some MediaTek based devices (#801).
+* MP3: Fix playback of some streams when stream length is unknown.
+* ID3: Support multiple frames of the same type in a single tag.
+* EIA608: Correctly handle repeated control characters, fixing an issue in which captions would
+  immediately disappear.
+* AVC3: Fix decoder failures on some MediaTek devices in the case where the first buffer fed to the
+  decoder does not start with SPS/PPS NAL units.
+* Misc bug fixes.
+
 ### r1.5.5 ###
 
 * DASH: Enable MP4 embedded WebVTT playback (#1185)
diff --git a/gradle.properties b/gradle.properties
index 34fb4618f0..e4a0986904 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,18 +1,16 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Settings specified in this file will override any Gradle settings
-# configured through the IDE.
-
+## Project-wide Gradle settings.
+#
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+#Thu Feb 04 15:49:07 GMT 2016
+android.useDeprecatedNdk=true