diff --git a/doc/source/developer-docs/quickstart-aio.rst b/doc/source/developer-docs/quickstart-aio.rst
index 4574f5c8f2..fa285311f0 100644
--- a/doc/source/developer-docs/quickstart-aio.rst
+++ b/doc/source/developer-docs/quickstart-aio.rst
@@ -46,6 +46,14 @@ should you need to customize your build:
 * Initial host bootstrap
 * Run playbooks
 
+If you are building an AIO on a new server, it is recommended you first
+upgrade all system packages and reboot into the new kernel:
+
+   .. code-block:: shell-session
+
+       # apt-get dist-upgrade
+       # reboot
+
 Start by cloning the OpenStack-Ansible repository and changing into the
 repository root directory:
 
diff --git a/doc/source/install-guide/targethosts-prepare.rst b/doc/source/install-guide/targethosts-prepare.rst
index bd44555389..fe84ac68b6 100644
--- a/doc/source/install-guide/targethosts-prepare.rst
+++ b/doc/source/install-guide/targethosts-prepare.rst
@@ -19,8 +19,14 @@ adding the Secure Shell (SSH) server packages to the installation.
 Configuring the operating system
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Check the kernel version, install additional software packages, and
-configure NTP.
+Upgrade system packages, check the kernel version, install additional
+software packages, and configure NTP.
+
+#. Upgrade system packages and kernel:
+
+   .. code-block:: shell-session
+
+       # apt-get dist-upgrade
 
 #. Check the kernel version. It should be ``3.13.0-34-generic`` or
    later.
@@ -43,7 +49,7 @@ configure NTP.
 
 #. Configure NTP to synchronize with a suitable time source.
 
-#. Reboot the host to activate the changes.
+#. Reboot the host to activate the changes and use new kernel.
 
 Deploying SSH keys
 ~~~~~~~~~~~~~~~~~~