diff --git a/build/build.xml b/build/build.xml
index 85183989c..3b5b42980 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -267,8 +267,8 @@
     </delete>
 
     <antcall target="unzip">
-      <param name="archive_file" value="./libastylej-2.04.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.04.zip" />
+      <param name="archive_file" value="./libastylej-2.05.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
       <param name="final_folder" value="${staging_folder}/libastylej" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
@@ -486,8 +486,8 @@
     <chmod perm="755" file="linux/work/arduino" />
 
     <antcall target="unzip">
-      <param name="archive_file" value="./libastylej-2.04.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.04.zip" />
+      <param name="archive_file" value="./libastylej-2.05.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
       <param name="final_folder" value="${staging_folder}/libastylej" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
@@ -715,8 +715,8 @@
     </antcall>
 
     <antcall target="unzip">
-      <param name="archive_file" value="./libastylej-2.04.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.04.zip" />
+      <param name="archive_file" value="./libastylej-2.05.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
       <param name="final_folder" value="${staging_folder}/libastylej" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
diff --git a/build/libastylej-2.04.zip.sha b/build/libastylej-2.04.zip.sha
deleted file mode 100644
index b7de92cae..000000000
--- a/build/libastylej-2.04.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-e62f8ff81296ca8bd46237e4254420394069d698
diff --git a/build/libastylej-2.05.zip.sha b/build/libastylej-2.05.zip.sha
new file mode 100644
index 000000000..31be12552
--- /dev/null
+++ b/build/libastylej-2.05.zip.sha
@@ -0,0 +1 @@
+2cd093d3da2b0204a666d90440f513b717c9f80c
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 9f24dfba1..45ac5e9d5 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -15,6 +15,7 @@ ARDUINO 1.6.0rc1
 * Improved avrdude verbose upload (Matthijs Kooijman)
 * (Mac OSX) Add Exported UTI for ino files, allows quick look to view the
   content of the file and external editors to syntax highlight as C++ (Matt Lloyd)
+* Updated libastyle to 2.05
 
 [core]
 * sam: added -MMD flag to let gcc produce dependency files (full rebuild on Arduino Due is now triggered only if needed)
@@ -23,6 +24,7 @@ ARDUINO 1.6.0rc1
 * LiquidCrystal: added setRowOffsets function to support different LCD hardware configurations (Mark Sproul)
 * LiquidCrystal: various improvements and optimizations (Matthijs Kooijman)
 * Fixed PROGMEM error in Robot_Control/examples/explore/R06_Wheel_Calibration
+* SD: Fixed SPI transaction mismatch (Paul Stoffregen)
 
 The following changes are included also in the Arduino IDE 1.0.7: