diff --git a/schemas/HPXMLBaseElements.xsd b/schemas/HPXMLBaseElements.xsd
index 99f94828..b29bb1fe 100644
--- a/schemas/HPXMLBaseElements.xsd
+++ b/schemas/HPXMLBaseElements.xsd
@@ -1212,7 +1212,12 @@
 									<xs:element minOccurs="0" name="DoorType" type="DoorType"/>
 									<xs:element name="DoorMaterial" type="DoorMaterial" minOccurs="0"/>
 									<xs:element minOccurs="0" name="WeatherStripping" type="HPXMLBoolean"/>
-									<xs:element name="StormDoor" type="HPXMLBoolean" minOccurs="0"/>
+									<xs:element name="StormDoor" minOccurs="0">
+										<xs:complexType>
+											<xs:group ref="StormInfo"/>
+											<xs:attribute name="dataSource" type="DataSource"/>
+										</xs:complexType>
+									</xs:element>
 									<xs:element name="RValue" type="RValue" minOccurs="0"/>
 									<xs:element minOccurs="0" name="LeakinessDescription" type="BuildingLeakiness"/>
 									<xs:element minOccurs="0" name="PerformanceClass" type="PerformanceClass"/>
@@ -4608,14 +4613,7 @@
 			<xs:element minOccurs="0" name="StormWindow">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:group ref="SystemInfo"/>
-						<xs:element minOccurs="0" name="GlazingMaterial" type="GlazingMaterial"/>
-						<xs:element minOccurs="0" name="GlassType" type="GlassType"/>
-						<xs:element minOccurs="0" name="FrameType" type="WindowFrameType"/>
-						<xs:element minOccurs="0" name="Location" type="StormLocation"/>
-						<xs:element minOccurs="0" name="Operable" type="HPXMLBoolean"/>
-						<xs:element minOccurs="0" name="Condition" type="WindowCondition"/>
-						<xs:element minOccurs="0" ref="extension"/>
+						<xs:group ref="StormInfo"/>
 					</xs:sequence>
 					<xs:attribute name="dataSource" type="DataSource"/>
 				</xs:complexType>
@@ -5533,4 +5531,16 @@
 		</xs:sequence>
 		<xs:attribute name="dataSource" type="DataSource"/>
 	</xs:complexType>
+	<xs:group name="StormInfo">
+		<xs:sequence>
+			<xs:group ref="SystemInfo"/>
+			<xs:element minOccurs="0" name="GlazingMaterial" type="GlazingMaterial"/>
+			<xs:element minOccurs="0" name="GlassType" type="GlassType"/>
+			<xs:element minOccurs="0" name="FrameType" type="WindowFrameType"/>
+			<xs:element minOccurs="0" name="Location" type="StormLocation"/>
+			<xs:element minOccurs="0" name="Operable" type="HPXMLBoolean"/>
+			<xs:element minOccurs="0" name="Condition" type="WindowCondition"/>
+			<xs:element minOccurs="0" ref="extension"/>
+		</xs:sequence>
+	</xs:group>
 </xs:schema>