diff --git a/configure.ac b/configure.ac
index f8d95c4e7..2de68add3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,7 @@ AC_CONFIG_FILES([
 	doc/lxc-cgroup.sgml
 	doc/lxc.conf.sgml
 	doc/lxc.sgml
+	doc/common_options.sgml
 	doc/see_also.sgml
 
 	scripts/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6113e46d9..2af6f752e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -31,7 +31,7 @@ man_MANS = \
 %.7 : %.sgml 
 	docbook2man -w all $<
 
-lxc-%.sgml : see_also.sgml
+lxc-%.sgml : common_options.sgml see_also.sgml
 
 clean-local:
 	$(RM) manpage.* *.7 *.5 *.1 *.sgml $(man_MANS)
diff --git a/doc/lxc-cgroup.sgml.in b/doc/lxc-cgroup.sgml.in
index 9a5ead073..5acd313d4 100644
--- a/doc/lxc-cgroup.sgml.in
+++ b/doc/lxc-cgroup.sgml.in
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 <!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
 
+<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>
 
@@ -74,17 +75,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     <title>Options</title>
     <variablelist>
 
-      <varlistentry>
-	<term>
-	  <option>-n <replaceable>name</replaceable></option>
-	</term>
-	<listitem>
-	  <para>
-	    Specify the container name associated with a control group.
-	  </para>
-	</listitem>
-      </varlistentry>
-
       <varlistentry>
 	<term>
 	  <option><replaceable>subsystem</replaceable></option>
@@ -111,6 +101,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
   </refsect1>
 
+  &commonoptions;
+
   <refsect1>
     <title>Examples</title>
     <variablelist>
diff --git a/doc/lxc-console.sgml.in b/doc/lxc-console.sgml.in
index ef4d270c1..606c868ac 100644
--- a/doc/lxc-console.sgml.in
+++ b/doc/lxc-console.sgml.in
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 <!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
 
+<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>
 
@@ -81,17 +82,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     <title>Options</title>
     <variablelist>
 
-      <varlistentry>
-	<term>
-	  <option>-n <replaceable>name</replaceable></option>
-	</term>
-	<listitem>
-	  <para>
-	    Specify the container name to open a console.
-	  </para>
-	</listitem>
-      </varlistentry>
-
       <varlistentry>
 	<term>
 	  <option>-t <optional>ttynum</optional></option>
@@ -108,6 +98,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
   </refsect1>
 
+  &commonoptions;
+
   <refsect1>
     <title>Diagnostic</title>
 
diff --git a/doc/lxc-create.sgml.in b/doc/lxc-create.sgml.in
index 815ec2c83..343f310cf 100644
--- a/doc/lxc-create.sgml.in
+++ b/doc/lxc-create.sgml.in
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 <!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
 
+<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>
 
@@ -82,17 +83,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     <title>Options</title>
     <variablelist>
 
-      <varlistentry>
-	<term>
-	  <option>-n <replaceable>name</replaceable></option>
-	</term>
-	<listitem>
-	  <para>
-	    Specify the container name to be created.
-	  </para>
-	</listitem>
-      </varlistentry>
-
       <varlistentry>
 	<term>
 	  <option>-f <replaceable>config_file</replaceable></option>
@@ -109,6 +99,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
   </refsect1>
 
+  &commonoptions;
+
   <refsect1>
     <title>Diagnostic</title>
 
diff --git a/doc/lxc-destroy.sgml.in b/doc/lxc-destroy.sgml.in
index ba265aa9a..f8c063ac4 100644
--- a/doc/lxc-destroy.sgml.in
+++ b/doc/lxc-destroy.sgml.in
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 <!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
 
+<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>
 
@@ -63,24 +64,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
   </refsect1>
 
-  <refsect1>
-    <title>Options</title>
-    <variablelist>
-
-      <varlistentry>
-	<term>
-	  <option>-n <replaceable>name</replaceable></option>
-	</term>
-	<listitem>
-	  <para>
-	    Specify the container name to be destroyed.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </refsect1>
+  &commonoptions;
 
   <refsect1>
     <title>Diagnostic</title>
diff --git a/doc/lxc-execute.sgml.in b/doc/lxc-execute.sgml.in
index 0043d140c..6d5bcd4c9 100644
--- a/doc/lxc-execute.sgml.in
+++ b/doc/lxc-execute.sgml.in
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 <!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
 
+<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>
 
@@ -89,17 +90,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     <title>Options</title>
     <variablelist>
 
-      <varlistentry>
-	<term>
-	  <option>-n <replaceable>name</replaceable></option>
-	</term>
-	<listitem>
-	  <para>
-	    Specify the container name to be executed.
-	  </para>
-	</listitem>
-      </varlistentry>
-
       <varlistentry>
 	<term>
 	  <option>-f <replaceable>config_file</replaceable></option>
@@ -116,6 +106,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
   </refsect1>
 
+  &commonoptions;
+
   <refsect1>
     <title>Diagnostic</title>
 
diff --git a/doc/lxc-freeze.sgml.in b/doc/lxc-freeze.sgml.in
index 5a3eb1d08..798ccf408 100644
--- a/doc/lxc-freeze.sgml.in
+++ b/doc/lxc-freeze.sgml.in
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 <!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
 
+<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>
 
@@ -65,24 +66,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
   </refsect1>
 
-  <refsect1>
-    <title>Options</title>
-    <variablelist>
-
-      <varlistentry>
-	<term>
-	  <option>-n <replaceable>name</replaceable></option>
-	</term>
-	<listitem>
-	  <para>
-	    Specify the container name to be frozen.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </refsect1>
+  &commonoptions;
 
   <refsect1>
     <title>Diagnostic</title>
diff --git a/doc/lxc-monitor.sgml.in b/doc/lxc-monitor.sgml.in
index bacae5eaa..7f7e6b2ad 100644
--- a/doc/lxc-monitor.sgml.in
+++ b/doc/lxc-monitor.sgml.in
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 <!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
 
+<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>
 
@@ -64,25 +65,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
   </refsect1>
 
-  <refsect1>
-    <title>Options</title>
-    <variablelist>
-
-      <varlistentry>
-	<term>
-	  <option>-n <replaceable>name</replaceable></option>
-	</term>
-	<listitem>
-	  <para>
-	    Specify the container name to be monitored. This option
-	    can be a regular expression conforming POSIX2.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </refsect1>
+  &commonoptions;
 
   <refsect1>
     <title>Examples</title>
diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in
index 587b44505..34a983707 100644
--- a/doc/lxc-start.sgml.in
+++ b/doc/lxc-start.sgml.in
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 <!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
 
+<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>
 
@@ -73,24 +74,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
   </refsect1>
 
-  <refsect1>
-    <title>Options</title>
-    <variablelist>
-
-      <varlistentry>
-	<term>
-	  <option>-n <replaceable>name</replaceable></option>
-	</term>
-	<listitem>
-	  <para>
-	    Specify the container name to be started.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </refsect1>
+  &commonoptions;
 
   <refsect1>
     <title>Diagnostic</title>
diff --git a/doc/lxc-stop.sgml.in b/doc/lxc-stop.sgml.in
index 6384c728b..d15e6497f 100644
--- a/doc/lxc-stop.sgml.in
+++ b/doc/lxc-stop.sgml.in
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 <!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
 
+<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>
 
@@ -63,24 +64,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
   </refsect1>
 
-  <refsect1>
-    <title>Options</title>
-    <variablelist>
-
-      <varlistentry>
-	<term>
-	  <option>-n <replaceable>name</replaceable></option>
-	</term>
-	<listitem>
-	  <para>
-	    Specify the container name to be stopped.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </refsect1>
+  &commonoptions;
 
   <refsect1>
     <title>Diagnostic</title>
diff --git a/doc/lxc-unfreeze.sgml.in b/doc/lxc-unfreeze.sgml.in
index f2360a03d..bb00d852a 100644
--- a/doc/lxc-unfreeze.sgml.in
+++ b/doc/lxc-unfreeze.sgml.in
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 <!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
 
+<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>
 
@@ -62,24 +63,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
   </refsect1>
 
-  <refsect1>
-    <title>Options</title>
-    <variablelist>
-
-      <varlistentry>
-	<term>
-	  <option>-n <replaceable>name</replaceable></option>
-	</term>
-	<listitem>
-	  <para>
-	    Specify the container name to be frozen.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </refsect1>
+  &commonoptions;
 
   <refsect1>
     <title>Diagnostic</title>
diff --git a/doc/lxc-wait.sgml.in b/doc/lxc-wait.sgml.in
index 5dc356628..97a4c3987 100644
--- a/doc/lxc-wait.sgml.in
+++ b/doc/lxc-wait.sgml.in
@@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 <!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
 
+<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>
 
@@ -66,17 +67,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     <title>Options</title>
     <variablelist>
 
-      <varlistentry>
-	<term>
-	  <option>-n <replaceable>name</replaceable></option>
-	</term>
-	<listitem>
-	  <para>
-	    Specify the container name to be waited.
-	  </para>
-	</listitem>
-      </varlistentry>
-
       <varlistentry>
 	<term>
 	  <option>-s <replaceable>states</replaceable></option>
@@ -93,6 +83,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
   </refsect1>
 
+  &commonoptions;
+
   <refsect1>
     <title>Examples</title>
     <variablelist>
@@ -106,7 +98,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
       </varlistentry>
 
       <varlistentry>
-	<term>lxc-wait -n 'RUNNING|STOPPED'</term>
+	<term>lxc-wait -n foo -s 'RUNNING|STOPPED'</term>
 	<listitem>
 	<para>
 	  exits when 'RUNNING' or 'STOPPED' state is reached.