diff --git a/android_ndk_config-w-patches b/android_ndk_config-w-patches
index e712b6908..39652d560 100644
--- a/android_ndk_config-w-patches
+++ b/android_ndk_config-w-patches
@@ -367,7 +367,7 @@ CONFIG_FEATURE_VI_COLON=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
 # CONFIG_FEATURE_VI_REGEX_SEARCH is not set
-CONFIG_FEATURE_VI_USE_SIGNALS=y
+# CONFIG_FEATURE_VI_USE_SIGNALS is not set [Broken for X86, siglongjmp missing from NDK r8b]
 CONFIG_FEATURE_VI_DOT_CMD=y
 CONFIG_FEATURE_VI_READONLY=y
 CONFIG_FEATURE_VI_SETOPTS=y
diff --git a/android_ndk_defconfigPlus b/android_ndk_defconfigPlus
index d01b2c288..5ac86f02f 100644
--- a/android_ndk_defconfigPlus
+++ b/android_ndk_defconfigPlus
@@ -367,7 +367,7 @@ CONFIG_FEATURE_VI_COLON=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
 # CONFIG_FEATURE_VI_REGEX_SEARCH is not set
-CONFIG_FEATURE_VI_USE_SIGNALS=y
+# CONFIG_FEATURE_VI_USE_SIGNALS is not set [Broken for X86, siglongjmp missing from NDK r8b]
 CONFIG_FEATURE_VI_DOT_CMD=y
 CONFIG_FEATURE_VI_READONLY=y
 CONFIG_FEATURE_VI_SETOPTS=y
diff --git a/android_ndk_stericson-like b/android_ndk_stericson-like
index b804ec461..3555fda2f 100644
--- a/android_ndk_stericson-like
+++ b/android_ndk_stericson-like
@@ -392,7 +392,7 @@ CONFIG_FEATURE_VI_COLON=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
 # CONFIG_FEATURE_VI_REGEX_SEARCH is not set
-CONFIG_FEATURE_VI_USE_SIGNALS=y
+# CONFIG_FEATURE_VI_USE_SIGNALS is not set [Broken for X86, siglongjmp missing from NDK r8b]
 CONFIG_FEATURE_VI_DOT_CMD=y
 CONFIG_FEATURE_VI_READONLY=y
 CONFIG_FEATURE_VI_SETOPTS=y