diff --git a/NEWS b/NEWS
index 5236963ff990e7e76d46ee7c148c336567e471d4..6709d3fa226d38a03e182369a338da5ffdecc222 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,30 @@
+Version 2.0.1
+  - added -H/-B startup parameters to gnt-instance, which will allow
+    re-adding the start in single-user option (regression from 1.2)
+  - the watcher writes the instance status to a file, to allow
+    monitoring to report the instance status (from the master) based on
+    cached results of the watcher's queries; while this can get stale if
+    the watcher is being locked due to other work on the cluster, this
+    is still an improvement
+  - the watcher now also restarts the node daemon and the rapi daemon if
+    they died
+  - fixed the watcher to handle full and drained queue cases
+  - hooks export more instance data in the environment, which helps if
+    hook scripts need to take action based on the instance's properties
+    (no longer need to query back into ganeti)
+  - instance failovers when the instance is stopped do not check for
+    free RAM, so that failing over a stopped instance is possible in low
+    memory situations
+  - rapi uses queries for tags instead of jobs (for less job traffic),
+    and for cluster tags it won't talk to masterd at all but read them
+    from ssconf
+  - a couple of error handling fixes in RAPI
+  - drbd handling: improved the error handling of inconsistent disks
+    after resync to reduce the frequency of "there are some degraded
+    disks for this instance" message
+  - fixed a bug in live migration when DRBD doesn't want to reconnect
+    (the error handling path called a wrong function name)
+
 Version 2.0.0 final
   - no changes from rc5
 
diff --git a/configure.ac b/configure.ac
index c04ad5e0475213c4dd1ab2535b6f9454660af38a..76eeb36df835110bb86c12e4fd33e85e8a60282c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Configure script for Ganeti
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [0])
-m4_define([gnt_version_revision], [0])
+m4_define([gnt_version_revision], [1])
 m4_define([gnt_version_suffix], [])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
diff --git a/lib/backend.py b/lib/backend.py
index 68dcf7f66ebb78bea6b20828e7ff8d5c89daa82e..b08c93739ea12f498ebc7f9f36a1d964788a6676 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -2392,7 +2392,7 @@ def DrbdAttachNet(nodes_ip, disks, instance_name, multimaster):
         # standalone, even though this should not happen with the
         # new staged way of changing disk configs
         try:
-          rd.ReAttachNet(multimaster)
+          rd.AttachNet(multimaster)
         except errors.BlockDeviceError, err:
           return (False, "Can't change network configuration: %s" % str(err))
     if all_connected:
diff --git a/man/gnt-backup.sgml b/man/gnt-backup.sgml
index f7efd78362d0c5c67f6db4653ba05d81b20080af..d432b6ef6eda9190005f9752ce3df65579ea7c5c 100644
--- a/man/gnt-backup.sgml
+++ b/man/gnt-backup.sgml
@@ -168,7 +168,7 @@
 
       <para>
         The NICs of the instances can be specified via the
-        <option>--nic</option> option. By default, one NIC is created
+        <option>--net</option> option. By default, one NIC is created
         for the instance, with the MAC set to the original MAC of the
         instance (as it was at export time). Each NIC can take up to
         three parameters (all optional):
diff --git a/man/gnt-cluster.sgml b/man/gnt-cluster.sgml
index 6c8f4e745582d79a1af82528d9989f031d410799..13bdf03a3365402032f376ee997df2da7bae29f5 100644
--- a/man/gnt-cluster.sgml
+++ b/man/gnt-cluster.sgml
@@ -627,7 +627,7 @@
         Example:
       </para>
 <screen>
-# gnt-cluster search time
+# gnt-cluster search-tags time
 /cluster ctime:2007-09-01
 /nodes/node1.example.com mtime:2007-10-04
 </screen>
diff --git a/man/gnt-instance.sgml b/man/gnt-instance.sgml
index 8ca11dec891c56945ffccadecaa2fbe18c493f3a..ff8b52e62aa1ec01fff4fb160229104031e9d203 100644
--- a/man/gnt-instance.sgml
+++ b/man/gnt-instance.sgml
@@ -148,7 +148,7 @@
 
         <para>
           The NICs of the instances can be specified via the
-          <option>--nic</option> option. By default, one NIC is
+          <option>--net</option> option. By default, one NIC is
           created for the instance, with a random MAC, and connected
           to the default bridge. Each NIC can take up to three
           parameters (all optional):
@@ -1200,12 +1200,12 @@ instance5: 11225
         </para>
 
         <para>
-          The <option>--nic
+          The <option>--net
           add:<replaceable>options</replaceable></option> option will
           add a new NIC to the instance. The available options are the
           same as in the <command>add</command> command (mac, ip,
-          bridge). The <option>--nice remove</option> will remove the
-          last NIC of the instance, while the <option>--nic
+          bridge). The <option>--net remove</option> will remove the
+          last NIC of the instance, while the <option>--net
           <replaceable>N</replaceable>:<replaceable>options</replaceable></option>
           option will change the parameters of the Nth instance NIC.
         </para>