diff --git a/conf/airframes/twinstar4.xml b/conf/airframes/twinstar4.xml
index 18a95977d1..08b53dfa1b 100755
--- a/conf/airframes/twinstar4.xml
+++ b/conf/airframes/twinstar4.xml
@@ -4,7 +4,7 @@
     <define name="IR2" value="2"/>
   </section>
   <servos min="1000" neutral="1500" max="2000">
-    <servo name="MOTOR" no="3" min="1000" neutral="1000" max="2000"/>
+    <servo name="GAZ" no="3" min="1000" neutral="1000" max="2000"/>
     <servo name="AILERON_LEFT" no="0" max="1190" neutral="1600" min="1850"/>
     <servo name="AILERON_RIGHT" no="2" max="1375" neutral="1650" min="2000"/>
     <servo name="ELEVATOR" no="6" max="1816" neutral="1530" min="1220"/>
@@ -13,7 +13,7 @@
     <servo name="CAM_PITCH" no="4" max="1270" neutral="1450" min="1850"/>
   </servos>
   <command>
-    <set servo="MOTOR" value="2 * @THROTTLE"/>
+    <set servo="GAZ" value="2 * @THROTTLE"/>
     <set servo="ELEVATOR" value="@PITCH"/>
     <let var="roll" value="@ROLL"/>
     <set servo="AILERON_LEFT" value="($roll > 0 ? 1 : AILERON_DIFF) * $roll"/>
@@ -85,4 +85,8 @@
     <define name="DEFAULT_PITCH" value="0.08" unit="rad"/>
 		<define name="HOME_RADIUS" value="50" unit="m"/>
 	</section>
+  <makefile>
+LOCAL_CFLAGS += -DWAVECARD
+$(TARGET).srcs += wavecard.c
+  </makefile>
 </airframe>