diff --git a/README b/README
index c6065442e..c3c335c91 100644
--- a/README
+++ b/README
@@ -38,6 +38,8 @@ before calling SSL_new();  Though it's not recommended.
 CyaSSL Release 2.5.0 (02/04/2013)
 
 Release 2.5.0 CyaSSL has bug fixes and new features including:
+- Fix for TLS CBC padding timing attack identified by Nadhem Alfardan and
+  Kenny Paterson: http://www.isg.rhul.ac.uk/tls/
 - Microchip PIC32 (MIPS16, MIPS32) support
 - Microchip MPLAB X example projects for PIC32 Ethernet Starter Kit
 - Updated CTaoCrypt benchmark app for embedded systems
diff --git a/configure.ac b/configure.ac
index c07f843f4..9d26e009b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 #
 #
 
-AC_INIT([cyassl],[2.4.7],[http://www.yassl.com])
+AC_INIT([cyassl],[2.5.0],[http://www.yassl.com])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/cyassl/version.h b/cyassl/version.h
index 04b3923bd..c76405051 100644
--- a/cyassl/version.h
+++ b/cyassl/version.h
@@ -26,8 +26,8 @@
 extern "C" {
 #endif
 
-#define LIBCYASSL_VERSION_STRING "2.4.7"
-#define LIBCYASSL_VERSION_HEX 0x02004007
+#define LIBCYASSL_VERSION_STRING "2.5.0"
+#define LIBCYASSL_VERSION_HEX 0x02005000
 
 #ifdef __cplusplus
 }
diff --git a/src/internal.c b/src/internal.c
index 6158c4d0c..ef6755094 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -3445,7 +3445,7 @@ static INLINE void Md5Rounds(int rounds, const byte* data, int sz)
 
     InitMd5(&md5);
 
-    for (i = 0; i < rounds; i++);
+    for (i = 0; i < rounds; i++)
         Md5Update(&md5, data, sz);
 }
 
@@ -3459,7 +3459,7 @@ static INLINE void ShaRounds(int rounds, const byte* data, int sz)
 
     InitSha(&sha);
 
-    for (i = 0; i < rounds; i++);
+    for (i = 0; i < rounds; i++)
         ShaUpdate(&sha, data, sz);
 }
 
@@ -3473,7 +3473,7 @@ static INLINE void Sha256Rounds(int rounds, const byte* data, int sz)
 
     InitSha256(&sha256);
 
-    for (i = 0; i < rounds; i++);
+    for (i = 0; i < rounds; i++)
         Sha256Update(&sha256, data, sz);
 }
 
@@ -3489,7 +3489,7 @@ static INLINE void Sha384Rounds(int rounds, const byte* data, int sz)
 
     InitSha384(&sha384);
 
-    for (i = 0; i < rounds; i++);
+    for (i = 0; i < rounds; i++)
         Sha384Update(&sha384, data, sz);
 }
 
@@ -3505,7 +3505,7 @@ static INLINE void Sha512Rounds(int rounds, const byte* data, int sz)
 
     InitSha512(&sha512);
 
-    for (i = 0; i < rounds; i++);
+    for (i = 0; i < rounds; i++)
         Sha512Update(&sha512, data, sz);
 }
 
@@ -3521,7 +3521,7 @@ static INLINE void RmdRounds(int rounds, const byte* data, int sz)
 
     InitRipeMd(&ripemd);
 
-    for (i = 0; i < rounds; i++);
+    for (i = 0; i < rounds; i++)
         RipeMdUpdate(&ripemd, data, sz);
 }
 
diff --git a/src/keys.c b/src/keys.c
index a0cf0f22d..c822f43fe 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -1205,7 +1205,6 @@ static int SetPrefix(byte* sha_input, int idx)
 static int SetKeys(Ciphers* enc, Ciphers* dec, Keys* keys, CipherSpecs* specs,
                    byte side, void* heap, int devId)
 {
-    (void)devId;
 #ifdef BUILD_ARC4
     word32 sz = specs->key_size;
     if (specs->bulk_cipher_algorithm == rc4) {
@@ -1470,6 +1469,7 @@ static int SetKeys(Ciphers* enc, Ciphers* dec, Keys* keys, CipherSpecs* specs,
     (void)enc;
     (void)dec;
     (void)specs;
+    (void)devId;
 
     return 0;
 }