diff --git a/ArduCopter/wscript b/ArduCopter/wscript
index 00bee1f3dd..7fc3b27190 100644
--- a/ArduCopter/wscript
+++ b/ArduCopter/wscript
@@ -35,14 +35,16 @@ def build(bld):
         ],
     )
 
-    frames = (
-        'quad', 'heli',
-    )
-    for frame in frames:
-        frame_config = frame.upper().replace('-', '_') + '_FRAME'
-        bld.ap_program(
-            program_name='arducopter-%s' % frame,
-            program_groups=['bin', 'copter'],
-            use=vehicle + '_libs',
-            defines=['FRAME_CONFIG=%s' % frame_config],
+    bld.ap_program(
+        program_name='arducopter',
+        program_groups=['bin', 'copter'],
+        use=vehicle + '_libs',
+        defines=['FRAME_CONFIG=MULTICOPTER_FRAME'],
+        )
+
+    bld.ap_program(
+        program_name='arducopter-heli',
+        program_groups=['bin', 'copter'],
+        use=vehicle + '_libs',
+        defines=['FRAME_CONFIG=HELI_FRAME'],
         )