diff --git a/conf/flight_plans/flight_plan.dtd b/conf/flight_plans/flight_plan.dtd
index fdbc1b9185..d4603a8846 100644
--- a/conf/flight_plans/flight_plan.dtd
+++ b/conf/flight_plans/flight_plan.dtd
@@ -1,8 +1,8 @@
 <!-- Paparazzi flight plan DTD -->
 
-<!ELEMENT flight_plan (header?,waypoints,sectors?,include*,exceptions?,blocks)>
+<!ELEMENT flight_plan (header?,waypoints,sectors?,includes?,exceptions?,blocks)>
 
-<!ELEMENT procedure (param*,waypoints,exceptions?,blocks)>
+<!ELEMENT procedure (param*,header?,waypoints?,sectors?,exceptions?,blocks?)>
 
 <!ELEMENT header (#PCDATA)>
 
@@ -14,6 +14,8 @@
 <!ELEMENT corner EMPTY>
 <!ELEMENT kml EMPTY>
 
+<!ELEMENT includes (include*)>
+
 <!ELEMENT exceptions (exception*)>
 
 <!ELEMENT blocks (block+)>
@@ -67,10 +69,13 @@ lat CDATA #IMPLIED
 lon CDATA #IMPLIED
 alt CDATA #IMPLIED>
 
+<!ATTLIST exceptions>
+
 <!ATTLIST sectors>
 
 <!ATTLIST sector
-name CDATA #REQUIRED>
+name CDATA #REQUIRED
+color CDATA #IMPLIED>
 
 <!ATTLIST corner
 name CDATA #REQUIRED>
@@ -78,6 +83,8 @@ name CDATA #REQUIRED>
 <!ATTLIST kml
 file CDATA #REQUIRED>
 
+<!ATTLIST blocks>
+
 <!ATTLIST block 
 name CDATA #REQUIRED
 pre_call CDATA #IMPLIED
@@ -197,6 +204,8 @@ throttle CDATA #IMPLIED>
 <!ATTLIST deroute
 block CDATA #REQUIRED>
 
+<!ATTLIST includes>
+
 <!ATTLIST include
 name CDATA #REQUIRED
 procedure CDATA #REQUIRED