diff -Nru fgfs-base-2.11.0+201305271200~git280b965/Aircraft/777/777-set-common.xml fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/777-set-common.xml
--- fgfs-base-2.11.0+201305271200~git280b965/Aircraft/777/777-set-common.xml	2013-05-27 01:05:46.000000000 +0000
+++ fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/777-set-common.xml	2013-05-28 01:08:31.000000000 +0000
@@ -9,7 +9,7 @@
             <cockpit type="int">4</cockpit>
             <model type="int">4</model>
         </rating>
-        <aircraft-version>20130526</aircraft-version>
+        <aircraft-version>20130527</aircraft-version>
         <flight-model>yasim</flight-model>
         <fuel-fraction type="double">0.1</fuel-fraction>
         <model n="0">
diff -Nru fgfs-base-2.11.0+201305271200~git280b965/Aircraft/777/Models/APpanel.xml fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Models/APpanel.xml
--- fgfs-base-2.11.0+201305271200~git280b965/Aircraft/777/Models/APpanel.xml	2013-04-28 16:12:39.000000000 +0000
+++ fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Models/APpanel.xml	2013-05-28 01:08:31.000000000 +0000
@@ -1331,6 +1331,27 @@
 				<condition>
 					<and>
 						<property>/systems/electrical/outputs/avionics</property>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV ALT</value>
+						</not-equals>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV SPD</value>
+						</not-equals>
+						<or>
+							<not-equals>
+								<property>instrumentation/afds/ap-modes/pitch-mode</property>
+								<value>VNAV PTH</value>
+							</not-equals>
+							<and>
+								<equals>
+									<property>instrumentation/afds/ap-modes/pitch-mode</property>
+									<value>VNAV PTH</value>
+								</equals>
+								<property>instrumentation/afds/settings/manual-intervention</property>
+							</and>
+						</or>
 						<not>
 							<property>instrumentation/afds/inputs/ias-mach-selected</property>
 						</not>
@@ -1346,6 +1367,27 @@
 				<condition>
 					<and>
 						<property>/systems/electrical/outputs/avionics</property>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV ALT</value>
+						</not-equals>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV SPD</value>
+						</not-equals>
+						<or>
+							<not-equals>
+								<property>instrumentation/afds/ap-modes/pitch-mode</property>
+								<value>VNAV PTH</value>
+							</not-equals>
+							<and>
+								<equals>
+									<property>instrumentation/afds/ap-modes/pitch-mode</property>
+									<value>VNAV PTH</value>
+								</equals>
+								<property>instrumentation/afds/settings/manual-intervention</property>
+							</and>
+						</or>
 						<property>instrumentation/afds/inputs/ias-mach-selected</property>
 					</and>
 				</condition>
@@ -1375,6 +1417,27 @@
 				<condition>
 					<and>
 						<property>/systems/electrical/outputs/avionics</property>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV ALT</value>
+						</not-equals>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV SPD</value>
+						</not-equals>
+						<or>
+							<not-equals>
+								<property>instrumentation/afds/ap-modes/pitch-mode</property>
+								<value>VNAV PTH</value>
+							</not-equals>
+							<and>
+								<equals>
+									<property>instrumentation/afds/ap-modes/pitch-mode</property>
+									<value>VNAV PTH</value>
+								</equals>
+								<property>instrumentation/afds/settings/manual-intervention</property>
+							</and>
+						</or>
 						<not>
 							<property>instrumentation/afds/inputs/ias-mach-selected</property>
 						</not>
@@ -1390,6 +1453,27 @@
 				<condition>
 					<and>
 						<property>/systems/electrical/outputs/avionics</property>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV ALT</value>
+						</not-equals>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV SPD</value>
+						</not-equals>
+						<or>
+							<not-equals>
+								<property>instrumentation/afds/ap-modes/pitch-mode</property>
+								<value>VNAV PTH</value>
+							</not-equals>
+							<and>
+								<equals>
+									<property>instrumentation/afds/ap-modes/pitch-mode</property>
+									<value>VNAV PTH</value>
+								</equals>
+								<property>instrumentation/afds/settings/manual-intervention</property>
+							</and>
+						</or>
 						<property>instrumentation/afds/inputs/ias-mach-selected</property>
 					</and>
 				</condition>
@@ -1445,6 +1529,27 @@
 				<condition>
 					<and>
 						<property>/systems/electrical/outputs/avionics</property>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV ALT</value>
+						</not-equals>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV SPD</value>
+						</not-equals>
+						<or>
+							<not-equals>
+								<property>instrumentation/afds/ap-modes/pitch-mode</property>
+								<value>VNAV PTH</value>
+							</not-equals>
+							<and>
+								<equals>
+									<property>instrumentation/afds/ap-modes/pitch-mode</property>
+									<value>VNAV PTH</value>
+								</equals>
+								<property>instrumentation/afds/settings/manual-intervention</property>
+							</and>
+						</or>
 						<not>
 							<property>instrumentation/afds/inputs/ias-mach-selected</property>
 						</not>
@@ -1460,6 +1565,27 @@
 				<condition>
 					<and>
 						<property>/systems/electrical/outputs/avionics</property>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV ALT</value>
+						</not-equals>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV SPD</value>
+						</not-equals>
+						<or>
+							<not-equals>
+								<property>instrumentation/afds/ap-modes/pitch-mode</property>
+								<value>VNAV PTH</value>
+							</not-equals>
+							<and>
+								<equals>
+									<property>instrumentation/afds/ap-modes/pitch-mode</property>
+									<value>VNAV PTH</value>
+								</equals>
+								<property>instrumentation/afds/settings/manual-intervention</property>
+							</and>
+						</or>
 						<property>instrumentation/afds/inputs/ias-mach-selected</property>
 					</and>
 				</condition>
@@ -1490,6 +1616,27 @@
 				<condition>
 					<and>
 						<property>/systems/electrical/outputs/avionics</property>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV ALT</value>
+						</not-equals>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV SPD</value>
+						</not-equals>
+						<or>
+							<not-equals>
+								<property>instrumentation/afds/ap-modes/pitch-mode</property>
+								<value>VNAV PTH</value>
+							</not-equals>
+							<and>
+								<equals>
+									<property>instrumentation/afds/ap-modes/pitch-mode</property>
+									<value>VNAV PTH</value>
+								</equals>
+								<property>instrumentation/afds/settings/manual-intervention</property>
+							</and>
+						</or>
 						<not>
 							<property>instrumentation/afds/inputs/ias-mach-selected</property>
 						</not>
@@ -1505,6 +1652,27 @@
 				<condition>
 					<and>
 						<property>/systems/electrical/outputs/avionics</property>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV ALT</value>
+						</not-equals>
+						<not-equals>
+							<property>instrumentation/afds/ap-modes/pitch-mode</property>
+							<value>VNAV SPD</value>
+						</not-equals>
+						<or>
+							<not-equals>
+								<property>instrumentation/afds/ap-modes/pitch-mode</property>
+								<value>VNAV PTH</value>
+							</not-equals>
+							<and>
+								<equals>
+									<property>instrumentation/afds/ap-modes/pitch-mode</property>
+									<value>VNAV PTH</value>
+								</equals>
+								<property>instrumentation/afds/settings/manual-intervention</property>
+							</and>
+						</or>
 						<property>instrumentation/afds/inputs/ias-mach-selected</property>
 					</and>
 				</condition>
diff -Nru fgfs-base-2.11.0+201305271200~git280b965/Aircraft/777/Nasal/AFDS.nas fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Nasal/AFDS.nas
--- fgfs-base-2.11.0+201305271200~git280b965/Aircraft/777/Nasal/AFDS.nas	2013-05-27 01:05:46.000000000 +0000
+++ fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Nasal/AFDS.nas	2013-05-28 01:08:31.000000000 +0000
@@ -880,6 +880,7 @@
 						and me.AP.getValue())
 				{
 					setprop("/controls/gear/tiller-enabled", 1);
+					setprop("controls/flight/aileron", 0);	# Aileron set neutral
 				}
 				if(getprop("velocities/groundspeed-kt") < 50)
 				{
diff -Nru fgfs-base-2.11.0+201305271200~git280b965/Aircraft/777/Systems/777-autopilot.xml fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Systems/777-autopilot.xml
--- fgfs-base-2.11.0+201305271200~git280b965/Aircraft/777/Systems/777-autopilot.xml	2013-05-27 01:05:46.000000000 +0000
+++ fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Systems/777-autopilot.xml	2013-05-28 01:08:31.000000000 +0000
@@ -221,7 +221,7 @@
 			<property>/controls/flight/rudder</property>
 		</output>
 		<config>
-			<Kp>0.05</Kp>
+			<Kp>0.03</Kp>
 			<Ki>0.01</Ki>
 			<u_min>-5.0</u_min>
 			<u_max>5.0</u_max>
@@ -278,13 +278,13 @@
 			<property>/orientation/roll-deg</property>
 		</input>
 		<reference>
-			<value>0.0</value>
+			<value>/orientation/side-slip-deg</value>
 		</reference>
 		<output>
 			<property>/autopilot/internal/target-roll-deg</property>
 		</output>
 		<config>
-			<Kp>5.0</Kp>
+			<Kp>15.0</Kp>
 			<Ki>0.0</Ki>
 			<u_min>
 				<property>instrumentation/afds/settings/bank-min</property>
@@ -324,10 +324,10 @@
 			<Ti>5</Ti>
 			<Td>0.0</Td>
 			<u_min>
-				<value>-0.5</value>
+				<value>-1.0</value>
 			</u_min>
 			<u_max>
-				<value>0.5</value>
+				<value>1.0</value>
 			</u_max>
 		</config>
 	</pid-controller>
@@ -900,13 +900,16 @@
 
 	<filter>
 		<name>Current GSVspped local</name> 
+		<debug>false</debug>
 		<type>gain</type>
 		<gain>1.0</gain>
 		<enable>
-			<greater-than>
-				<property>position/gear-agl-ft</property>
-				<value>150</value>
-			</greater-than>
+			<condition>
+				<greater-than>
+					<property>position/gear-agl-ft</property>
+					<value>150.0</value>
+				</greater-than>
+			</condition>
 		</enable>
 		<input>
 			<property>/instrumentation/nav[0]/gs-rate-of-climb</property>
diff -Nru fgfs-base-2.11.0+201305271200~git280b965/Aircraft/777/Systems/777-spoiler-fcs.xml fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Systems/777-spoiler-fcs.xml
--- fgfs-base-2.11.0+201305271200~git280b965/Aircraft/777/Systems/777-spoiler-fcs.xml	2013-04-28 13:27:59.000000000 +0000
+++ fgfs-base-2.11.0+201305272000~git6fd80e3/Aircraft/777/Systems/777-spoiler-fcs.xml	2013-05-28 01:08:31.000000000 +0000
@@ -38,8 +38,10 @@
 					<value>1</value>
 				</equals>
 				<property>autopilot/autobrake/throttles-at-idle</property>
-				<property>gear/gear[1]/wow</property>
-				<property>gear/gear[2]/wow</property>
+				<or>
+					<property>gear/gear[1]/wow</property>
+					<property>gear/gear[2]/wow</property>
+				</or>
 				<greater-than>
 					<property>velocities/groundspeed-kt</property>
 					<value>60</value>
diff -Nru fgfs-base-2.11.0+201305271200~git280b965/debian/changelog fgfs-base-2.11.0+201305272000~git6fd80e3/debian/changelog
--- fgfs-base-2.11.0+201305271200~git280b965/debian/changelog	2013-05-27 17:06:00.000000000 +0000
+++ fgfs-base-2.11.0+201305272000~git6fd80e3/debian/changelog	2013-05-28 01:08:41.000000000 +0000
@@ -1,3 +1,21 @@
+fgfs-base (2.11.0+201305272000~git6fd80e3-0ubuntu0ppa1) raring; urgency=low
+
+  [ Hyde Yamakawa ]
+  * 777:In air rollout improvement.
+
+  [ Saikrishna Arcot ]
+
+ -- Saikrishna Arcot <saiarcot895@gmail.com>  Mon, 27 May 2013 20:08:41 -0500
+
+fgfs-base (2.11.0+201305271600~git4f6b194-0ubuntu0ppa1) raring; urgency=low
+
+  [ BARANGER Emmanuel ]
+  * Hughes H4 Hercules : Glasses dishes on instruments and compatibility Rembrandt
+
+  [ Saikrishna Arcot ]
+
+ -- Saikrishna Arcot <saiarcot895@gmail.com>  Mon, 27 May 2013 16:07:10 -0500
+
 fgfs-base (2.11.0+201305271200~git280b965-0ubuntu0ppa1) raring; urgency=low
 
   [ Curtis L. Olson ]