diff --git a/LUFA/Drivers/Misc/RingBuffer.h b/LUFA/Drivers/Misc/RingBuffer.h
index 3c5552143bcf0ee3105fa6a02afcefa9553eadef..5b509b6059bb1a0712fcce8cf2e04d587bdb1cd1 100644
--- a/LUFA/Drivers/Misc/RingBuffer.h
+++ b/LUFA/Drivers/Misc/RingBuffer.h
@@ -113,7 +113,7 @@
 			uint8_t* Out; /**< Current retrieval location in the circular buffer. */
 			uint8_t* Start; /**< Pointer to the start of the buffer's underlying storage array. */
 			uint8_t* End; /**< Pointer to the end of the buffer's underlying storage array. */
-			uint8_t  Size; /**< Size of the buffer's underlying storage array. */
+			uint16_t Size; /**< Size of the buffer's underlying storage array. */
 			uint16_t Count; /**< Number of bytes currently stored in the buffer. */
 		} RingBuffer_t;
 
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 1b3003f80ae9608e99a0f8706c863cefa83262a2..4bb153ce80aa0f188492c65c7a7f1eab04f4ad5a 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -22,7 +22,7 @@
   *
   *  <b>Fixed:</b>
   *  - Core:
-  *   - None
+  *   - Fixed ring buffer size limited to 255 elements, instead of the intended 65535 elements.
   *  - Library Applications:
   *   - Added reliability patches to the AVRISP-MKII Clone project's PDI/TPI protocols (thanks to Justin Mattair)
   *