diff --git a/libr/core/cconfig.c b/libr/core/cconfig.c
index a277ba4ff0750..048875aebecc6 100644
--- a/libr/core/cconfig.c
+++ b/libr/core/cconfig.c
@@ -3526,6 +3526,7 @@ R_API int r_core_config_init(RCore *core) {
 
 	/* anal */
 	SETBPREF ("anal.onchange", "false", "automatically reanalyze function if any byte has changed (EXPERIMENTAL)");
+	SETI ("anal.fcnalign", 0,  "use ArchInfo.funcAlign if zero, otherwise override (used by aap and others)");
 	SETPREF ("anal.fcnprefix", "fcn",  "prefix new function names with this");
 	const char *analcc = r_anal_cc_default (core->anal);
 	SETCB ("anal.cc", analcc? analcc: "", (RConfigCallback)&cb_analcc, "specify default calling convention");
diff --git a/libr/core/cmd_search.inc.c b/libr/core/cmd_search.inc.c
index 22868a64373f3..29b2cc07e0dfd 100644
--- a/libr/core/cmd_search.inc.c
+++ b/libr/core/cmd_search.inc.c
@@ -428,9 +428,12 @@ R_API int r_core_search_prelude(RCore *core, ut64 from, ut64 to, const ut8 *buf,
 	}
 	r_search_reset (core->search, R_SEARCH_KEYWORD);
 	RSearchKeyword *kw = r_search_keyword_new (buf, blen, mask, mlen, NULL);
-	const int funcali = r_anal_archinfo (core->anal, R_ARCH_INFO_FUNC_ALIGN);
-	if (funcali > 1) {
-		kw->align = funcali;
+	const int afuncali = r_anal_archinfo (core->anal, R_ARCH_INFO_FUNC_ALIGN);
+	const int ufuncali = r_config_get_i (core->config, "cfg.fcnalign");
+	if (ufuncali > 1) {
+		kw->align = ufuncali;
+	} else if (afuncali > 1) {
+		kw->align = afuncali;
 	}
 	r_search_kw_add (core->search, kw);
 	r_search_begin (core->search);