diff --git a/Aircraft/Instruments/Textures/aoa-indexer.rgb b/Aircraft/Instruments/Textures/aoa-indexer.rgb
new file mode 100644
index 000000000..087042af4
Binary files /dev/null and b/Aircraft/Instruments/Textures/aoa-indexer.rgb differ
diff --git a/Aircraft/Instruments/aoa-indexer.xml b/Aircraft/Instruments/aoa-indexer.xml
new file mode 100644
index 000000000..ee6fce73f
--- /dev/null
+++ b/Aircraft/Instruments/aoa-indexer.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0"?>
+<!-- Angle of Attack indexer, as used on US Navy carrier aircraft.  The
+     operation of these things is simple.  When the AoA is too low, the
+     bottom arrow glows red.  This indicates to the pilot that they
+     should pull back on the stick to raise the nose and slow down.
+     When the AoA is too high, the pilot gets a green, downward
+     pointing top arrow telling him to push the stick forward, lower
+     the nose, and speed up.
+
+     This instrument needs its angle thresholds supplied externally
+     (probably from the aircraft -set file), in these four properties:
+       /sim/aoa-indexer/too-slow-deg  (usually target +1.5 deg)
+       /sim/aoa-indexer/slow-deg      (target +0.5 deg)
+       /sim/aoa-indexer/fast-deg      (target -0.5 deg)
+       /sim/aoa-indexer/too-fast-deg  (target -1.5 deg)
+
+     Note that there is no instrument background texture.  This just
+     applies alpha-blended "lights" to something else in the 3D
+     cockpit.
+-->
+
+<PropertyList>
+
+ <name>Angle of Attack Indexer</name>
+ <w-base>2.0</w-base>
+ <h-base>5.0</h-base>
+
+ <layers>
+
+  <layer>
+   <name>too slow</name>
+   <w>2</w>
+   <h>5</h>
+   <texture>
+    <path>Aircraft/Instruments/Textures/aoa-indexer.rgb</path>
+    <x1>0.0</x1>
+    <y1>0.0</y1>
+    <x2>0.2</x2>
+    <y2>1.0</y2>
+   </texture>
+   <condition>
+    <greater-than>
+     <property>/velocities/alpha-deg</property>
+     <property>/sim/aoa-indexer/too-slow-deg</property>
+    </greater-than>
+   </condition>
+  </layer>
+
+  <layer>
+   <name>slow</name>
+   <w>2</w>
+   <h>5</h>
+   <texture>
+    <path>Aircraft/Instruments/Textures/aoa-indexer.rgb</path>
+    <x1>0.2</x1>
+    <y1>0.0</y1>
+    <x2>0.4</x2>
+    <y2>1.0</y2>
+   </texture>
+   <condition>
+    <less-than>
+     <property>/velocities/alpha-deg</property>
+     <property>/sim/aoa-indexer/too-slow-deg</property>
+    </less-than>
+    <greater-than>
+     <property>/velocities/alpha-deg</property>
+     <property>/sim/aoa-indexer/slow-deg</property>
+    </greater-than>
+   </condition>
+  </layer>
+
+  <layer>
+   <name>on-speed</name>
+   <w>2</w>
+   <h>5</h>
+   <texture>
+    <path>Aircraft/Instruments/Textures/aoa-indexer.rgb</path>
+    <x1>0.4</x1>
+    <y1>0.0</y1>
+    <x2>0.6</x2>
+    <y2>1.0</y2>
+   </texture>
+   <condition>
+    <less-than>
+     <property>/velocities/alpha-deg</property>
+     <property>/sim/aoa-indexer/slow-deg</property>
+    </less-than>
+    <greater-than>
+     <property>/velocities/alpha-deg</property>
+     <property>/sim/aoa-indexer/fast-deg</property>
+    </greater-than>
+   </condition>
+  </layer>
+
+  <layer>
+   <name>fast</name>
+   <w>2</w>
+   <h>5</h>
+   <texture>
+    <path>Aircraft/Instruments/Textures/aoa-indexer.rgb</path>
+    <x1>0.6</x1>
+    <y1>0.0</y1>
+    <x2>0.8</x2>
+    <y2>1.0</y2>
+   </texture>
+   <condition>
+    <less-than>
+     <property>/velocities/alpha-deg</property>
+     <property>/sim/aoa-indexer/fast-deg</property>
+    </less-than>
+    <greater-than>
+     <property>/velocities/alpha-deg</property>
+     <property>/sim/aoa-indexer/too-fast-deg</property>
+    </greater-than>
+   </condition>
+  </layer>
+
+  <layer>
+   <name>too fast</name>
+   <w>2</w>
+   <h>5</h>
+   <texture>
+    <path>Aircraft/Instruments/Textures/aoa-indexer.rgb</path>
+    <x1>0.8</x1>
+    <y1>0.0</y1>
+    <x2>1.0</x2>
+    <y2>1.0</y2>
+   </texture>
+   <condition>
+    <less-than>
+     <property>/velocities/alpha-deg</property>
+     <property>/sim/aoa-indexer/too-fast-deg</property>
+    </less-than>
+   </condition>
+  </layer>
+
+ </layers>
+</PropertyList>
+
+
diff --git a/Aircraft/a4-yasim-set.xml b/Aircraft/a4-yasim-set.xml
index 2542ef98c..a4df19869 100644
--- a/Aircraft/a4-yasim-set.xml
+++ b/Aircraft/a4-yasim-set.xml
@@ -35,7 +35,7 @@ October 23 2001 John Check, fgpanels@rockfish.net
    <internal archive="y">true</internal>
    <config>
     <x-offset-m archive="y">0</x-offset-m>
-    <y-offset-m archive="y">0.77</y-offset-m>
+    <y-offset-m archive="y">0.83</y-offset-m>
     <z-offset-m archive="y">-2.82</z-offset-m>
    </config>
   </view>
@@ -44,6 +44,13 @@ October 23 2001 John Check, fgpanels@rockfish.net
     <pitch-offset-deg>-17</pitch-offset-deg>
   </current-view>
 
+  <aoa-indexer>
+   <too-slow-deg>15.0</too-slow-deg>
+   <slow-deg>14.0</slow-deg>
+   <fast-deg>13.0</fast-deg>
+   <too-fast-deg>12.0</too-fast-deg>
+  </aoa-indexer>
+
  </sim>
 
  <autopilot>