diff --git a/ra/Makefile b/ra/1.0/Makefile
similarity index 100%
copy from ra/Makefile
copy to ra/1.0/Makefile
diff --git a/ra/ra-api-1.rng b/ra/1.0/ra-api.ng
similarity index 100%
copy from ra/ra-api-1.rng
copy to ra/1.0/ra-api.ng
diff --git a/ra/ra-metadata-example.xml b/ra/1.0/ra-metadata-example.xml
similarity index 100%
copy from ra/ra-metadata-example.xml
copy to ra/1.0/ra-metadata-example.xml
diff --git a/ra/resource-agent-api.md b/ra/1.0/resource-agent-api.md
similarity index 100%
copy from ra/resource-agent-api.md
copy to ra/1.0/resource-agent-api.md
diff --git a/ra/latest b/ra/latest
new file mode 120000
index 0000000..9f8e9b6
--- /dev/null
+++ b/ra/latest
@@ -0,0 +1 @@
+1.0
\ No newline at end of file
diff --git a/ra/Makefile b/ra/next/Makefile
similarity index 61%
rename from ra/Makefile
rename to ra/next/Makefile
index 5a985f0..128b6be 100644
--- a/ra/Makefile
+++ b/ra/next/Makefile
@@ -1,19 +1,23 @@
 # Basic DocBook mangling makefile. 
 #
 # 
 
 BASENAME=resource-agent-api
+GRAMMAR=ra-api.ng
+TEST_FILES=ra-metadata-example-1.0.xml ra-metadata-example.xml
 
 .PHONY: all clean
 
 %.html: %.md
 	pandoc -f markdown -o $@ $^
 
 %.pdf: %.md
 	pandoc -f markdown -o $@ $^
 
 all: $(BASENAME).pdf $(BASENAME).html
 
 clean:
 	rm $(BASENAME).pdf $(BASENAME).html||true
 
+check: $(GRAMMAR) $(TEST_FILES)
+	xmllint --relaxng $(GRAMMAR) --noout $(TEST_FILES)
diff --git a/ra/ra-api-1.rng b/ra/next/ra-api.ng
similarity index 78%
rename from ra/ra-api-1.rng
rename to ra/next/ra-api.ng
index a288997..0aa077e 100644
--- a/ra/ra-api-1.rng
+++ b/ra/next/ra-api.ng
@@ -1,103 +1,124 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0">
 
 <start><element name="resource-agent">
 	<attribute name="name" />
 	<optional><attribute name="version" /></optional>
 
 	<element name="version"> <text /> </element>
 
+	<zeroOrMore><element name="longdesc">
+		<ref name="description" />
+	</element></zeroOrMore>
+
+	<zeroOrMore><element name="shortdesc">
+		<ref name="description" />
+	</element></zeroOrMore>
+
 	<element name="parameters"> <oneOrMore>
 		<element name="parameter">
 			<attribute name="name" />
 			<optional>
 				<attribute name="unique"> <ref name="boolean-values" /> </attribute>
 			</optional>
 
 			<oneOrMore> <element name="longdesc">
-				<attribute name="lang" />
-				<ref name="anyElement" />
+				<ref name="description" />
 			</element> </oneOrMore>
 
 			<oneOrMore> <element name="shortdesc">
-				<attribute name="lang" />
-				<ref name="anyElement" />
+				<ref name="description" />
 			</element> </oneOrMore>
 
 			<element name="content">
 				<choice>
 					<attribute name="type">
 						<choice>
 							<value>boolean</value>
 							<value>string</value>
 							<value>integer</value>
 						</choice>
 					</attribute>
+					<group>
+						<attribute name="type">
+							<value>select</value>
+						</attribute>
+						<oneOrMore>
+							<element name="option">
+								<attribute name="value" />
+							</element>
+						</oneOrMore>
+					</group>
 				</choice>
 				<optional>
 					<attribute name="default"> <text /> </attribute>
 				</optional>
 			</element>
 		</element>
 	</oneOrMore> </element>
 
 	<element name="actions"> <oneOrMore>
 		<element name="action">
 			<attribute name="name">
 				<choice>
 					<value>start</value>
 					<value>stop</value>
 					<value>recover</value>
 					<value>status</value>
 					<value>reload</value>
 					<value>meta-data</value>
 					<value>verify-all</value>
 				</choice>
 			</attribute>
 			<attribute name="timeout" />
 			<optional><attribute name="interval" /></optional>
 			<optional><attribute name="start-delay" /></optional>
 			<optional><attribute name="depth" /></optional>
 		</element>
 	</oneOrMore> </element>
 	<element name="special">
 		<attribute name="tag" />
 		<ref name="anyElement" />
 	</element>
 </element></start>
 
 <define name="boolean-values">
 	<choice>
 		<value>0</value>
 		<value>1</value>
 	</choice>
 </define>
 
+<define name="description">
+	<attribute name="lang" />
+	<ref name="anyElement" />
+</define>
+
 <define name="any">
 	 <zeroOrMore>
 		 <choice>
 			 <attribute>
 				 <anyName/>
 			 </attribute>
 			 <text/>
 			 <element>
 					 <anyName/>
 					 <ref name="any" />
 			 </element>
 		 </choice>
 	 </zeroOrMore>
 </define>
 
 <define name="anyElement">
 	 <zeroOrMore>
 		 <choice>
 			 <text/>
 			 <element>
 					 <anyName/>
 					 <ref name="any" />
 			 </element>
 		 </choice>
 	 </zeroOrMore>
  </define>
 
 </grammar>
diff --git a/ra/ra-metadata-example.xml b/ra/next/ra-metadata-example-1.0.xml
similarity index 100%
copy from ra/ra-metadata-example.xml
copy to ra/next/ra-metadata-example-1.0.xml
diff --git a/ra/ra-metadata-example.xml b/ra/next/ra-metadata-example.xml
similarity index 88%
rename from ra/ra-metadata-example.xml
rename to ra/next/ra-metadata-example.xml
index 71a5dd0..394f50c 100644
--- a/ra/ra-metadata-example.xml
+++ b/ra/next/ra-metadata-example.xml
@@ -1,105 +1,120 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!-- Root element: give the name of the Resource agent -->
 <resource-agent name="Filesystem" version="FailSafe 1.0.4">
 
 <!-- Version number of the standard this complies with -->
 <version>1.0</version>
 
+<longdesc lang="en">
+  Filesystem <b>matters</b>.
+</longdesc>
+
 <!-- List all the instance parameters the RA supports or requires. -->
 <parameters>
 
 <!-- Note that parameters flagged with 'unique' must be unique; ie no
      other resource instance of this resource type may have the same set
      of unique parameters.
  -->
- 
+
 <parameter name="Mountpoint" unique="1">
 <!-- This is the long, helpful description of what the parameter is all
-     about. A user interface might display it to the user if he asks for 
-     elaborate help with an option, and it would obviously also provide 
+     about. A user interface might display it to the user if he asks for
+     elaborate help with an option, and it would obviously also provide
      examples etc.
-     
+
      You can have multiple ones with different "lang" attributes, but this is
      not required.
 -->
 <longdesc lang="en">
 The resource name is the directory where the filesystem will be actually
-mounted.  Please make sure it exists. 
+mounted.  Please make sure it exists.
 </longdesc>
 
 <!-- The shortdesc may be displayed by the resource manager as a tooltip or
      equivalent -->
 <shortdesc lang="en">Mountpoint</shortdesc>
 
 <!-- Further definition of the content -->
 <content type="string" default="/mnt" />
 
 </parameter>
 
 <parameter name="Device" unique="1">
 <longdesc lang="en">
 When mounting a filesystem on a specific mountpoint, you have to specify which
 device should be mounted; this will usually be similiar to /dev/sda1 or
 /dev/volumegroup/logicalvolume when using LVM.
 </longdesc>
 <shortdesc lang="en">Device to be mounted</shortdesc>
 <content type="string" default="/dev/"/>
 </parameter>
 
 <parameter name="FSType">
 <longdesc lang="en">
 You should chose a journaled filesystem for the shared storage to ensure that
 the filesystem remains consistent and that it can be mounted without an
 expensive fsck run; recommendations include reiserfs, ext3 and XFS.
 </longdesc>
 <shortdesc lang="en">Type of the filesystem</shortdesc>
 <content type="string" default="reiserfs"/>
 </parameter>
 
 <parameter name="mount_options">
 <longdesc lang="en">
 The mount options used for mounting a filesystem; normally this is set to
 defaults, but you may want to modify this if you require a read-only
 mount or something similar.
 </longdesc>
 <shortdesc lang="en">Mount options for this filesystem</shortdesc>
 <content type="string" default="defaults" />
 </parameter>
 
+<parameter name="fstype">
+<longdesc lang="en">
+The fstype options is used to specify file system type.
+</longdesc>
+<shortdesc lang="en">Filesystem type</shortdesc>
+<content type="select" default="ext3">
+  <option value="ext3" />
+  <option value="ext4" />
+</content>
+</parameter>
+
 </parameters>
 
 <!-- List the actions supported by the RA -->
 <actions>
 <!-- Valid actions: start, stop, recover, status, reload, verify-all
-     
+
      The timeout is given in seconds (or s, m, h, d postfix and their
      usual meanings) and should be a reasonable _hint_ to the RM how
-     long a certain action might take in the worst case. 
+     long a certain action might take in the worst case.
   -->
 <action name="start"   timeout="2m30s" />
 <action name="stop"    timeout="100" />
 <action name="recover" timeout="150" />
 <!-- In what intervals the RM should poll the RA for status; and how early
      after the start of the RA is should start. Again, this are just
      _defaults_ and can be overridden by the RM. -->
 <action name="status" depth="0"  timeout="20" interval="10" start-delay="1m" />
 <action name="status" depth="10" timeout="60" interval="1h" start-delay="5m" />
 <action name="status" depth="20" timeout="2m" interval="1d" start-delay="1d" />
 <action name="reload"  timeout="60" />
 <action name="meta-data"  timeout="5" />
 <!-- As with all not mandatory actions, this one is only listed if supported
   -->
 <action name="verify-all"  timeout="30" />
 
 </actions>
 
 <!-- Vendor specific attributes; as the content _inside_ the special tag is
-     obviously not covered by the RA-API DTD, it will not validate, but oh 
+     obviously not covered by the RA-API DTD, it will not validate, but oh
      well...
   -->
 <special tag="FailSafe">
 <Ordering>403</Ordering>
 </special>
 
 </resource-agent>
diff --git a/ra/resource-agent-api.md b/ra/next/resource-agent-api.md
similarity index 100%
rename from ra/resource-agent-api.md
rename to ra/next/resource-agent-api.md