diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml
index af9ce4c8..21e68190 100644
--- a/Sounds/A320-common-sound.xml
+++ b/Sounds/A320-common-sound.xml
@@ -1009,6 +1009,22 @@
 				<factor>40.0</factor>
 			</volume>
 		</apoff>
+
+		<autolandwarning>
+			<name>autolandwarning-single</name>
+			<mode>once</mode>
+			<path>Aircraft/A320-family/Sounds/Cockpit/calvary-charge-once.wav</path>
+			<condition>
+				<equals>
+					<property>/instrumentation/pfd/lights/autoland-alarm</property>
+					<value>1</value>
+				</equals>
+			</condition>
+			<volume>
+				<property>/sim/current-view/internal</property>
+				<factor>40.0</factor>
+			</volume>
+		</autolandwarning>
 		
 		<gear>
 			<name>gear0</name>
diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml
index b1f53ffa..1821e7e5 100644
--- a/Systems/a320-fwc.xml
+++ b/Systems/a320-fwc.xml
@@ -2302,25 +2302,31 @@
 		</switch>
 
 		<switch name="/instrumentation/pfd/lights/autoland-armed">
-			<default value="0"/>
-			<test logic="OR" value="1">
-				<!-- /gear/gear[0]/wow eq 0 -->				
-			    <test logic="AND">
-				  /modes/pfd/ILS1 eq 1
-				  /instrumentation/radar-altimeter[0]/radar-altitude-ft-corrected le 200
-				</test>				
-			    <test logic="AND">
-				  /modes/pfd/ILS2 eq 1
-				  /instrumentation/radar-altimeter[1]/radar-altitude-ft-corrected le 200
-				</test>				
-				<!-- /instrumentation/radar-altimeter[1]/radar-altitude-ft-corrected le 200 -->
-			</test>
-		</switch>		
-
-		<switch name="/instrumentation/pfd/lights/autoland-on">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				<test logic="OR">
+					/systems/electrical/bus/ac-2 ge 110
+					/systems/electrical/bus/ac-ess-shed ge 110
+				</test>
+				<test logic="OR">
+					<test logic="AND">
+						/modes/pfd/ILS1 eq 1
+						/instrumentation/radar-altimeter[0]/radar-altitude-ft-corrected lt 200
+					</test>				
+					<test logic="AND">
+						/modes/pfd/ILS2 eq 1
+						/instrumentation/radar-altimeter[1]/radar-altitude-ft-corrected lt 200
+					</test>				
+				</test>
+			</test>
+		</switch>				
+
+		<switch name="/instrumentation/pfd/lights/autoland-alarm">
+			<default value="0"/>
+			<test logic="AND" value="1">			
 			  /instrumentation/pfd/lights/autoland-armed eq 1
+  			  <!-- /modes/pfd/fma/pitch-mode eq "LAND" -->
+			  /it-autoflight/output/vert eq 2			  
 			  <test logic="OR">
 				<test logic="AND">
 					/it-autoflight/output/ap1 eq 0
@@ -2335,6 +2341,20 @@
 		    </test>
 		</switch>		
 
+		<switch name="/instrumentation/pfd/lights/autoland-on">
+			<default value="0"/>
+			<test logic="OR" value="1">
+			  <test logic="AND">
+			    /instrumentation/pfd/lights/autoland-alarm eq 1				
+			  	/instrumentation/pfd/lights/autoland-sw-pulse eq 1
+			  </test>
+			  <test logic="AND">
+			    /it-autoflight/output/ap-warning eq 1
+			    /ECAM/warnings/master-warning-flash eq 1
+			  </test>
+		    </test>
+		</switch>		
+
 	</channel>
 	
 	<channel name="ENG" execrate="16">
diff --git a/Systems/pfd.xml b/Systems/pfd.xml
index 733054dc..b7c90410 100644
--- a/Systems/pfd.xml
+++ b/Systems/pfd.xml
@@ -574,4 +574,15 @@
 		<output>/instrumentation/iesi/pitch-deg</output>
 	</filter>
 
+	<flipflop>
+        <type>monostable</type>
+        <time>
+            <value>1.5</value>
+        </time>
+        <S>
+			<property>/instrumentation/pfd/lights/autoland-armed</property>
+        </S>
+        <output>/instrumentation/pfd/lights/autoland-sw-pulse</output>
+    </flipflop>
+
 </PropertyList>