diff --git a/sha1_armv4.h b/sha1_armv4.h
index 14e3e051..63ec6394 100644
--- a/sha1_armv4.h
+++ b/sha1_armv4.h
@@ -9,7 +9,9 @@
 extern "C" {
 #endif
 
-void sha1_block_data_order(void *state, const void *data, size_t blocks);
+/* Crypto++ modifed sha1_block_data_order to pass caps as a parameter. */
+/* Also see https://github.com/weidai11/cryptopp/issues/846.           */
+void sha1_block_data_order(void *state, const void *data, size_t blocks, unsigned int caps);
 
 /* Cryptogams arm caps */
 #define ARMV7_NEON (1<<0)
diff --git a/sha256_armv4.h b/sha256_armv4.h
index 615333e7..8488b086 100644
--- a/sha256_armv4.h
+++ b/sha256_armv4.h
@@ -9,7 +9,9 @@
 extern "C" {
 #endif
 
-void sha256_block_data_order(void *state, const void *data, size_t blocks);
+/* Crypto++ modifed sha256_block_data_order to pass caps as a parameter. */
+/* Also see https://github.com/weidai11/cryptopp/issues/846.             */
+void sha256_block_data_order(void *state, const void *data, size_t blocks, unsigned int caps);
 
 /* Cryptogams arm caps */
 #define ARMV7_NEON (1<<0)
diff --git a/sha512_armv4.S b/sha512_armv4.S
index 9d07a9bf..99e58682 100644
--- a/sha512_armv4.S
+++ b/sha512_armv4.S
@@ -133,11 +133,7 @@ K512:
 	WORD64(0x4cc5d4be,0xcb3e42b6,	0x597f299c,0xfc657e2a)
 	WORD64(0x5fcb6fab,0x3ad6faec,	0x6c44198c,0x4a475817)
 .size	K512,.-K512
-#if __ARM_MAX_ARCH__>=7
-.skip	32-4
-#else
 .skip	32
-#endif
 
 .globl	sha512_block_data_order
 .type	sha512_block_data_order,%function
diff --git a/sha512_armv4.h b/sha512_armv4.h
index f3a7d9e9..52cb81f8 100644
--- a/sha512_armv4.h
+++ b/sha512_armv4.h
@@ -9,7 +9,9 @@
 extern "C" {
 #endif
 
-void sha512_block_data_order(void *state, const void *data, size_t blocks);
+/* Crypto++ modifed sha256_block_data_order to pass caps as a parameter. */
+/* Also see https://github.com/weidai11/cryptopp/issues/846.             */
+void sha512_block_data_order(void *state, const void *data, size_t blocks, unsigned int caps);
 
 /* Cryptogams arm caps */
 #define ARMV7_NEON (1<<0)