diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py
index 4a3ce94449..22c58007f8 100644
--- a/Tools/ardupilotwaf/boards.py
+++ b/Tools/ardupilotwaf/boards.py
@@ -311,8 +311,10 @@ class Board:
         if cfg.options.disable_ekf3:
             env.CXXFLAGS += ['-DHAL_NAVEKF3_AVAILABLE=0']
 
-        if cfg.options.osd:
+        if cfg.options.osd or cfg.options.osd_fonts:
             env.CXXFLAGS += ['-DOSD_ENABLED=1']
+
+        if cfg.options.osd_fonts:
             for f in os.listdir('libraries/AP_OSD/fonts'):
                 if fnmatch.fnmatch(f, "font*bin"):
                     env.ROMFS_FILES += [(f,'libraries/AP_OSD/fonts/'+f)]
diff --git a/wscript b/wscript
index 837f6b69c4..6e02bb52b7 100644
--- a/wscript
+++ b/wscript
@@ -191,6 +191,10 @@ configuration in order to save typing.
     g.add_option('--osd', action='store_true',
                  default=False,
                  help="Enable OSD support")
+
+    g.add_option('--osd-fonts', action='store_true',
+                 default=False,
+                 help="Enable OSD support with fonts")
     
     g.add_option('--sitl-osd', action='store_true',
                  default=False,