diff --git a/Firmata.cpp b/Firmata.cpp
index e35c3dcb..ee01f8f5 100644
--- a/Firmata.cpp
+++ b/Firmata.cpp
@@ -1,5 +1,5 @@
 /*
-  Firmata.cpp - Firmata library v2.5.7 - 2017-08-19
+  Firmata.cpp - Firmata library v2.5.8 - 2018-04-15
   Copyright (c) 2006-2008 Hans-Christoph Steiner.  All rights reserved.
   Copyright (C) 2009-2017 Jeff Hoefs.  All rights reserved.
 
diff --git a/Firmata.h b/Firmata.h
index c07b38d3..fa0fa6c2 100644
--- a/Firmata.h
+++ b/Firmata.h
@@ -1,5 +1,5 @@
 /*
-  Firmata.h - Firmata library v2.5.7 - 2017-08-19
+  Firmata.h - Firmata library v2.5.8 - 2018-04-15
   Copyright (c) 2006-2008 Hans-Christoph Steiner.  All rights reserved.
   Copyright (C) 2009-2017 Jeff Hoefs.  All rights reserved.
 
diff --git a/library.properties b/library.properties
index 83431fc9..0dc9a348 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=Firmata
-version=2.5.7
+version=2.5.8
 author=Firmata Developers
 maintainer=https://github.com/firmata/arduino
 sentence=Enables the communication with computer apps using a standard serial protocol. For all Arduino/Genuino boards.
diff --git a/readme.md b/readme.md
index 46692a5b..988edfd7 100644
--- a/readme.md
+++ b/readme.md
@@ -107,7 +107,7 @@ $ git clone git@github.com:firmata/arduino.git ~/Documents/Arduino/libraries/Fir
 
 ## Updating Firmata in the Arduino IDE - older versions (<= 1.6.3 or 1.0.x)
 
-Download the latest [release](https://github.com/firmata/arduino/releases/tag/2.5.7) (for Arduino 1.0.x or Arduino 1.5.6 or higher) and replace the existing Firmata folder in your Arduino application. See the instructions below for your platform.
+Download the latest [release](https://github.com/firmata/arduino/releases/tag/2.5.8) (for Arduino 1.0.x or Arduino 1.5.6 or higher) and replace the existing Firmata folder in your Arduino application. See the instructions below for your platform.
 
 *Note that Arduino 1.5.0 - 1.5.5 are not supported. Please use Arduino 1.5.6 or higher (or Arduino 1.0.5 or 1.0.6).*
 
@@ -118,7 +118,7 @@ The Firmata library is contained within the Arduino package.
 1. Navigate to the Arduino application
 2. Right click on the application icon and select `Show Package Contents`
 3. Navigate to: `/Contents/Resources/Java/libraries/` and replace the existing
-`Firmata` folder with latest [Firmata release](https://github.com/firmata/arduino/releases/tag/2.5.7) (note there is a different download
+`Firmata` folder with latest [Firmata release](https://github.com/firmata/arduino/releases/tag/2.5.8) (note there is a different download
 for Arduino 1.0.x vs 1.6.x)
 4. Restart the Arduino application and the latest version of Firmata will be available.
 
@@ -128,7 +128,7 @@ will differ slightly: `Contents/Java/libraries/Firmata` (no Resources directory)
 ### Windows:
 
 1. Navigate to `c:/Program\ Files/arduino-1.x/libraries/` and replace the existing
-`Firmata` folder with the latest [Firmata release](https://github.com/firmata/arduino/releases/tag/2.5.7) (note there is a different download
+`Firmata` folder with the latest [Firmata release](https://github.com/firmata/arduino/releases/tag/2.5.8) (note there is a different download
 for Arduino 1.0.x vs 1.6.x).
 2. Restart the Arduino application and the latest version of Firmata will be available.
 
@@ -137,7 +137,7 @@ for Arduino 1.0.x vs 1.6.x).
 ### Linux:
 
 1. Navigate to `~/arduino-1.x/libraries/` and replace the existing
-`Firmata` folder with the latest [Firmata release](https://github.com/firmata/arduino/releases/tag/2.5.7) (note there is a different download
+`Firmata` folder with the latest [Firmata release](https://github.com/firmata/arduino/releases/tag/2.5.8) (note there is a different download
 for Arduino 1.0.x vs 1.6.x).
 2. Restart the Arduino application and the latest version of Firmata will be available.
 
diff --git a/release.sh b/release.sh
index 05cb74e4..0c47db8d 100644
--- a/release.sh
+++ b/release.sh
@@ -15,7 +15,7 @@ cd temp
 find . -name "*.DS_Store" -type f -delete
 zip -r Firmata.zip ./Firmata/
 cd ..
-mv ./temp/Firmata.zip Arduino-1.0.x-Firmata-2.5.7.zip
+mv ./temp/Firmata.zip Arduino-1.0.x-Firmata-2.5.8.zip
 
 #package for Arduino 1.6.x and 1.8.x
 cp library.properties temp/Firmata
@@ -29,5 +29,5 @@ cd ..
 find . -name "*.DS_Store" -type f -delete
 zip -r Firmata.zip ./Firmata/
 cd ..
-mv ./temp/Firmata.zip Firmata-2.5.7.zip
+mv ./temp/Firmata.zip Firmata-2.5.8.zip
 rm -r ./temp