diff --git a/ferris/config.h b/ferris/config.h
index 1812395..3179a87 100644
--- a/ferris/config.h
+++ b/ferris/config.h
@@ -37,7 +37,7 @@
 // details see https://precondition.github.io/home-row-mods
 
 // the default of 200
-#define TAPPING_TERM 200
+#define TAPPING_TERM 180
 
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
diff --git a/ferris/keymap.c b/ferris/keymap.c
index 2722f29..e8a96b2 100644
--- a/ferris/keymap.c
+++ b/ferris/keymap.c
@@ -80,7 +80,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // see https://getreuer.info/posts/keyboards/achordion/index.html
 
 #include "achordion.h"
-#include "achordion.c"
+
+// By default, the timeout is 1000 ms for all keys.
+uint16_t achordion_timeout(uint16_t tap_hold_keycode) {
+  return 500;
+}
 
 bool process_record_user(uint16_t keycode, keyrecord_t* record) {
   if (!process_achordion(keycode, record)) { return false; }
diff --git a/ferris/rules.mk b/ferris/rules.mk
index 4cf4696..95f780e 100644
--- a/ferris/rules.mk
+++ b/ferris/rules.mk
@@ -12,6 +12,9 @@ NKRO_ENABLE = yes
 # sym_eager_pk does do some key chatter
 DEBOUNCE_TYPE = asym_eager_defer_pk
 
+# achordion
+SRC += achordion.c
+
 # build
 # qmk compile -kb ferris/sweep -km christoph-cullmann
 # qmk flash -kb ferris/sweep -km christoph-cullmann