diff --git a/rgmanager/src/resources/postgres-8.metadata b/rgmanager/src/resources/postgres-8.metadata
index e7ae14f23..c9f752c8b 100644
--- a/rgmanager/src/resources/postgres-8.metadata
+++ b/rgmanager/src/resources/postgres-8.metadata
@@ -1,107 +1,95 @@
 <?xml version="1.0"?>
 <resource-agent version="rgmanager 2.0" name="postgres-8">
     <version>1.0</version>
 
     <longdesc lang="en">
         This defines an instance of PostgreSQL server
     </longdesc>
     <shortdesc lang="en">
         Defines a PostgreSQL server
     </shortdesc>
 
     <parameters>
         <parameter name="name" primary="1">
 	    <longdesc lang="en">
 	        Specifies a service name for logging and other purposes
 	    </longdesc>
             <shortdesc lang="en">
                 Name
             </shortdesc>
 	    <content type="string"/>
         </parameter>
 
         <parameter name="config_file">
             <longdesc lang="en">
                 Define absolute path to configuration file
             </longdesc>
             <shortdesc lang="en">
                 Config File
             </shortdesc>
 	    <content type="string" default="/var/lib/pgsql/data/postgresql.conf"/>
         </parameter>
 
 	<parameter name="postmaster_user">
 		<longdesc lang="en">
 			User who runs the database server because it can't be
 			run by root.
 		</longdesc>
 		<shortdesc lang="en">
 			User who runs the database server
 		</shortdesc>
 		<content type="string" default="postgres" />
 	</parameter>
 
 	<parameter name="postmaster_options">
 		<longdesc lang="en">
 			Other command-line options for postmaster
 		</longdesc>
 		<shortdesc lang="en">
 			Other command-line options for postmaster
 		</shortdesc>
 		<content type="string" default="-D /var/lib/pgsql/data"/>
 	</parameter>
 
-	<parameter name="shutdown_wait">
-		<longdesc lang="en">
-			Wait X seconds for correct end of service shutdown. 
-			This option is ignored in current release.
-		</longdesc>
-		<shortdesc lang="en">
-			Wait X seconds for correct end of service shutdown
-			This option is ignored in current release.
-		</shortdesc>
-		<content type="integer" />
-	</parameter>
-
         <parameter name="startup_wait">
                 <longdesc lang="en">
                         Wait X seconds for correct end of service startup
                 </longdesc>
                 <shortdesc lang="en">
 			Wait X seconds for correct end of service startup.
                 </shortdesc>
                 <content type="number" default="10"/>
         </parameter>
 
         <parameter name="service_name" inherit="service%name">
             <longdesc lang="en">
 	    	Inherit the service name.  We need to know
 		the service name in order to determine file
 		systems and IPs for this service.
             </longdesc>
             <shortdesc lang="en">
 	    	Inherit the service name.
             </shortdesc>
 	    <content type="string"/>
         </parameter>
     </parameters>
 
     <actions>
         <action name="start" timeout="30"/>
 	<action name="stop" timeout="30"/>
 
 	<!-- Checks to see if it''s mounted in the right place -->
 	<action name="status" interval="1m" timeout="10"/>
 	<action name="monitor" interval="1m" timeout="10"/>
 
 	<!-- Checks to see if we can read from the mountpoint -->
 	<action name="status" depth="10" timeout="30" interval="5m"/>
 	<action name="monitor" depth="10" timeout="30" interval="5m"/>
 
 	<action name="meta-data" timeout="0"/>
 	<action name="validate-all" timeout="0"/>
     </actions>
 
     <special tag="rgmanager">
     </special>
 </resource-agent>