diff --git a/legacy/bootloader/Makefile b/legacy/bootloader/Makefile
index 944252823..9b3ea621d 100644
--- a/legacy/bootloader/Makefile
+++ b/legacy/bootloader/Makefile
@@ -4,11 +4,30 @@ OBJS += bootloader.o
 OBJS += signatures.o
 OBJS += usb.o
 
-# overrides from libtrezor
+# Overrides from libtrezor. Objects ending with 'small.o' are built with -Os to
+# make bootloader smaller.
 CFLAGS += -DFONT_SKIP_FIXED=1
 OBJS += ../gen/fonts.small.o
+OBJS += ../startup.o
+OBJS += ../buttons.small.o
+OBJS += ../common.small.o
+OBJS += ../flash.small.o
+OBJS += ../layout.small.o
+OBJS += ../oled.small.o
+OBJS += ../random_delays.small.o
+OBJS += ../rng.small.o
+OBJS += ../setup.small.o
+OBJS += ../util.small.o
+OBJS += ../memory.small.o
+OBJS += ../supervise.small.o
+OBJS += ../timer.small.o
+OBJS += ../usb_standard.small.o
+OBJS += ../usb21_standard.small.o
+OBJS += ../webusb.small.o
+OBJS += ../winusb.small.o
+OBJS += ../gen/bitmaps.small.o
 
-# overrides from trezor-crypto
+# Overrides from trezor-crypto
 CFLAGS += -DUSE_PRECOMPUTED_IV=0
 CFLAGS += -DUSE_PRECOMPUTED_CP=0
 OBJS += ../vendor/trezor-crypto/bignum.small.o
@@ -22,5 +41,8 @@ OPTFLAGS ?= -Os
 
 include ../Makefile.include
 
+# Remove libtrezor from linking since we specified the small versions
+LDLIBS := $(filter-out -ltrezor,$(LDLIBS))
+
 align: $(NAME).bin
 	./firmware_align.py $(NAME).bin