diff --git a/GNUmakefile.llvm b/GNUmakefile.llvm
index d369165842..c23af20045 100644
--- a/GNUmakefile.llvm
+++ b/GNUmakefile.llvm
@@ -43,7 +43,8 @@ endif
 LLVMVER  = $(shell $(LLVM_CONFIG) --version 2>/dev/null | sed 's/git//' | sed 's/svn//' )
 LLVM_MAJOR = $(shell $(LLVM_CONFIG) --version 2>/dev/null | sed 's/\..*//' )
 LLVM_MINOR = $(shell $(LLVM_CONFIG) --version 2>/dev/null | sed 's/.*\.//' | sed 's/git//' | sed 's/svn//' | sed 's/ .*//' )
-LLVM_UNSUPPORTED = $(shell $(LLVM_CONFIG) --version 2>/dev/null | egrep -q '^3\.[0-3]|^1[3-9]' && echo 1 || echo 0 )
+LLVM_UNSUPPORTED = $(shell $(LLVM_CONFIG) --version 2>/dev/null | egrep -q '^[0-2]\.|3\.[0-3]' && echo 1 || echo 0 )
+LLVM_TOO_NEW = $(shell $(LLVM_CONFIG) --version 2>/dev/null | egrep -q '^1[3-9]' && echo 1 || echo 0 )
 LLVM_NEW_API = $(shell $(LLVM_CONFIG) --version 2>/dev/null | egrep -q '^1[0-9]' && echo 1 || echo 0 )
 LLVM_10_OK = $(shell $(LLVM_CONFIG) --version 2>/dev/null | egrep -q '^1[1-9]|^10\.[1-9]|^10\.0.[1-9]' && echo 1 || echo 0 )
 LLVM_HAVE_LTO = $(shell $(LLVM_CONFIG) --version 2>/dev/null | egrep -q '^1[1-9]' && echo 1 || echo 0 )
@@ -61,6 +62,10 @@ ifeq "$(LLVM_UNSUPPORTED)" "1"
   $(warning llvm_mode only supports llvm versions 3.4 up to 12)
 endif
 
+ifeq "$(LLVM_TOO_NEW)" "1"
+  $(warning you are using an in-development llvm version - this might break llvm_mode!)
+endif
+
 LLVM_TOO_OLD=1
 
 ifeq "$(LLVM_MAJOR)" "9"
diff --git a/qemu_mode/qemuafl b/qemu_mode/qemuafl
index 9a258d5b7a..246c1777f4 160000
--- a/qemu_mode/qemuafl
+++ b/qemu_mode/qemuafl
@@ -1 +1 @@
-Subproject commit 9a258d5b7a38c045a6e385fcfcf80a746a60e557
+Subproject commit 246c1777f453a280cbafc57f92742147ffc72818
diff --git a/unicorn_mode/unicornafl b/unicorn_mode/unicornafl
index fb2fc9f25d..80d31ef367 160000
--- a/unicorn_mode/unicornafl
+++ b/unicorn_mode/unicornafl
@@ -1 +1 @@
-Subproject commit fb2fc9f25df32f17f6b6b859e4dbd70f9a857e0c
+Subproject commit 80d31ef367f7a1a75fc48e08e129d10f2ffa0498