diff --git a/app/src/processing/app/Serial.java b/app/src/processing/app/Serial.java
index a5d826896..b8acc4615 100644
--- a/app/src/processing/app/Serial.java
+++ b/app/src/processing/app/Serial.java
@@ -175,7 +175,7 @@ public class Serial implements SerialPortEventListener {
   public synchronized void serialEvent(SerialPortEvent serialEvent) {
     if (serialEvent.isRXCHAR()) {
       try {
-        byte[] buf = port.readBytes();
+        byte[] buf = port.readBytes(serialEvent.getEventValue());
         if (buf.length > 0) {
           if (bufferLast == buffer.length) {
             byte temp[] = new byte[bufferLast << 1];
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 0ca8c1660..41e14b1db 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -1,4 +1,9 @@
 
+ARDUINO 1.5.6-r2 BETA 2014.02.21
+
+[ide]
+* JSSC: Fixed NPE when RXCHAR event with no bytes (José Pereda)
+
 ARDUINO 1.5.6 BETA 2014.02.20
 
 [ide]