diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py
index a06feadacb..ba07ffc589 100644
--- a/Tools/ardupilotwaf/boards.py
+++ b/Tools/ardupilotwaf/boards.py
@@ -94,6 +94,16 @@ class Board:
                 ENABLE_ONVIF=0,
             )
 
+        # allow enable of OpenDroneID for any board
+        if cfg.options.enable_opendroneid:
+            env.ENABLE_OPENDRONEID = True
+            env.DEFINES.update(
+                AP_OPENDRONEID_ENABLED=1,
+            )
+            cfg.msg("Enabled OpenDroneID", 'yes')
+        else:
+            cfg.msg("Enabled OpenDroneID", 'no', color='YELLOW')
+
         # allow enable of firmware ID checking for any board
         if cfg.options.enable_check_firmware:
             env.CHECK_FIRMWARE_ENABLED = True
diff --git a/wscript b/wscript
index b02ab41518..ba8ed7b5a5 100644
--- a/wscript
+++ b/wscript
@@ -225,10 +225,14 @@ submodules at specific revisions.
                  default=False,
                  help="enable generation of scripting documentation")
 
+    g.add_option('--enable-opendroneid', action='store_true',
+                 default=False,
+                 help="Enables OpenDroneID")
+
     g.add_option('--enable-check-firmware', action='store_true',
                  default=False,
                  help="Enables firmware ID checking on boot")
-    
+
     g = opt.ap_groups['linux']
 
     linux_options = ('--prefix', '--destdir', '--bindir', '--libdir')