diff --git a/doc/source/install.rst b/doc/source/install.rst
index da2d85c38..f5132a607 100644
--- a/doc/source/install.rst
+++ b/doc/source/install.rst
@@ -17,6 +17,10 @@ packaged, some of them - under its old name *ironic-discoverd*.
 
 .. _PyPI: https://pypi.python.org/pypi/ironic-inspector
 
+Note for Ubuntu users
+  Please beware :ref:`possible DNS issues <ubuntu-dns>` when installing
+  Ironic-Inspector on Ubuntu.
+
 Version Support Matrix
 ~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/doc/source/troubleshooting.rst b/doc/source/troubleshooting.rst
index 7ff8519e0..39e3c8379 100644
--- a/doc/source/troubleshooting.rst
+++ b/doc/source/troubleshooting.rst
@@ -103,6 +103,8 @@ see what is going on with the ramdisk. The ramdisk drops into emergency shell
 on failure, which you can use to look around. There should be file called
 ``logs`` with the current ramdisk logs.
 
+.. _ubuntu-dns:
+
 Troubleshooting DNS issues on Ubuntu
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -111,3 +113,8 @@ before calling out to an external DNS server. When DNSmasq is installed and
 configured for use with ironic-inspector, it can cause problems by interfering
 with the local DNS cache. To fix this issue ensure that ``/etc/resolve.conf``
 points to your external DNS servers and not to ``127.0.0.1``.
+
+On Ubuntu 14.04 this can be done by editing your
+``/etc/resolvconf/resolv.conf.d/head`` and adding your nameservers there.
+This will ensure they will come up first when ``/etc/resolv.conf``
+is regenerated.