diff --git a/AUTHORS b/AUTHORS
index 62655dfde..fc987c8da 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -268,6 +268,7 @@ Wencey Wang
 windfishballad
 xefoci7612
 Xiang Wang (KatyushaScarlet)
+Yen-Chao Shen (lemteay)
 zz4032
 
 # Additionally, we acknowledge the authors and maintainers of fishtest,
diff --git a/src/Makefile b/src/Makefile
index dff34638c..4eb64ffef 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -905,6 +905,13 @@ ifeq ($(OS), Android)
 	LDFLAGS += -fPIE -pie
 endif
 
+### 3.11 Inline settings
+ifeq ($(optimize), yes)
+	ifeq ($(comp), clang)
+		CXXFLAGS += -Xclang -mllvm -Xclang -inline-threshold=500
+	endif
+endif
+
 ### ==========================================================================
 ### Section 4. Public Targets
 ### ==========================================================================