diff --git a/submodules/build/builders.d/srtp.mk b/submodules/build/builders.d/srtp.mk
index e8b955078..2e2c9b1d6 100644
--- a/submodules/build/builders.d/srtp.mk
+++ b/submodules/build/builders.d/srtp.mk
@@ -17,6 +17,7 @@ clean-srtp:
 
 veryclean-srtp:
 	-cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make distclean
+	-rm -rf $(BUILDER_BUILD_DIR)/$(srtp_dir)
 	-rm -f $(BUILDER_SRC_DIR)/$(srtp_dir)/configure
 
 clean-makefile-srtp:
diff --git a/submodules/build/builders.d/srtp.patch b/submodules/build/builders.d/srtp.patch
deleted file mode 100644
index c3d127b13..000000000
--- a/submodules/build/builders.d/srtp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rupN ../srtp_old/crypto/cipher/aes_icm.c ./crypto/cipher/aes_icm.c
---- ../srtp_old/crypto/cipher/aes_icm.c	2006-03-16 18:11:29.000000000 +0100
-+++ ./crypto/cipher/aes_icm.c	2011-09-06 10:19:16.000000000 +0200
-@@ -281,7 +281,7 @@ aes_icm_set_iv(aes_icm_ctx_t *c, void *i
-  * this is an internal, hopefully inlined function
-  */
-   
--inline void
-+static void
- aes_icm_advance_ismacryp(aes_icm_ctx_t *c, uint8_t forIsmacryp) {
-   /* fill buffer with new keystream */
-   v128_copy(&c->keystream_buffer, &c->counter);
-diff -rupN ../srtp_old/crypto/math/datatypes.c ./crypto/math/datatypes.c
---- ../srtp_old/crypto/math/datatypes.c	2005-10-08 18:38:06.000000000 +0200
-+++ ./crypto/math/datatypes.c	2011-09-06 10:02:55.000000000 +0200
-@@ -124,7 +124,7 @@ octet_string_hex_string(const void *s, i
-   return bit_string;
- }
- 
--inline int
-+static int
- hex_char_to_nibble(uint8_t c) {
-   switch(c) {
-   case ('0'): return 0x0;
diff --git a/submodules/externals/srtp b/submodules/externals/srtp
index 9d08cb329..f21cc2418 160000
--- a/submodules/externals/srtp
+++ b/submodules/externals/srtp
@@ -1 +1 @@
-Subproject commit 9d08cb3299af0be8893d898a4cf3358ad26874b7
+Subproject commit f21cc24184a285d0b7fec42dba7851a66f7a94ae