diff --git a/NEWS b/NEWS
index 8331994644660cf769f804ee482e9f068958a32d..b6cd1fdb98d422d63bcba20076f246f9ee41ea58 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,29 @@ Version 2.2.0 beta 0
   ``EXP_SIZE_FD``
 
 
+Version 2.1.4
+-------------
+
+*(Released Fri, 18 Jun 2010)*
+
+A small bugfix release:
+
+  - Fix live migration of KVM instances started with older Ganeti
+    versions which had fewer hypervisor parameters
+  - Fix gnt-instance grow-disk on down instances
+  - Fix an error-reporting bug during instance migration
+  - Better checking of the ``--net`` and ``--disk`` values, to avoid
+    silently ignoring broken ones
+  - Fix an RPC error reporting bug affecting, for example, RAPI client
+    users
+  - Fix bug triggered by different API version os-es on different nodes
+  - Fix a bug in instance startup with custom hvparams: OS level
+    parameters would fail to be applied.
+  - Fix the RAPI client under Python 2.6 (but more work is needed to
+    make it work completely well with OpenSSL)
+  - Fix handling of errors when resolving names from DNS
+
+
 Version 2.1.3
 -------------
 
diff --git a/lib/utils.py b/lib/utils.py
index 3be5d66c478deea29470302f3ea6b770bd5f734e..b19e5a4374862e10e9eaf0de89135a53f40b21a3 100644
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -1129,8 +1129,9 @@ class HostInfo:
     """
     try:
       result = socket.gethostbyname_ex(hostname)
-    except socket.gaierror, err:
-      # hostname not found in DNS
+    except (socket.gaierror, socket.herror, socket.error), err:
+      # hostname not found in DNS, or other socket exception in the
+      # (code, description format)
       raise errors.ResolverError(hostname, err.args[0], err.args[1])
 
     return result
diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index 193f51ee0e1e5d1676e23bb85b8da55480f9406b..05f36ec184bdcb8e976a9f57506fb022d3040711 100644
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -90,9 +90,9 @@
     "# Whether to test the tools/move-instance utility": null,
     "inter-cluster-instance-move": false,
 
-    "# Make sure not to include the disk(s) required for Dom0 to be": null,
-    "# included in the volume group used for instances. Otherwise": null,
-    "# whole system may stop working until restarted.": null,
+    "# Make sure not to include the disk(s) required for Dom0 to be up": null,
+    "# in the volume group used for instances. Otherwise the whole": null,
+    "# system may stop working until restarted.": null,
     "instance-disk-failure": false
   },