diff --git a/build/make/configure.sh b/build/make/configure.sh
index 71efa99ce4efbe1e5b54516493ce2a86c3b01b0e..7070ec076dee71ae3893a38e4ec25680b2811de6 100755
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -88,6 +88,7 @@ Build options:
   ${toggle_debug}             enable/disable debug mode
   ${toggle_gprof}             enable/disable gprof profiling instrumentation
   ${toggle_gcov}              enable/disable gcov coverage instrumentation
+  ${toggle_thumb}             enable/disable building arm assembly in thumb mode
 
 Install options:
   ${toggle_install_docs}      control whether docs are installed
@@ -819,6 +820,11 @@ EOF
 
             enabled debug && add_asflags -g
             asm_conversion_cmd="${source_path}/build/make/ads2gas.pl"
+            if enabled thumb; then
+                asm_conversion_cmd="$asm_conversion_cmd -thumb"
+                check_add_cflags -mthumb
+                check_add_asflags -mthumb -mimplicit-it=always
+            fi
             ;;
         rvct)
             CC=armcc
diff --git a/configure b/configure
index 5f2c39183c27f6979c33b44fd36fcd724aea0435..f10e6adc06eb498c530b7dd665facd8a2e84384b 100755
--- a/configure
+++ b/configure
@@ -317,6 +317,7 @@ CMDLINE_SELECT="
     optimizations
     ccache
     runtime_cpu_detect
+    thumb
 
     libs
     examples