diff -Nru base-files-9.6ubuntu1/debian/changelog base-files-9.6ubuntu2/debian/changelog
--- base-files-9.6ubuntu1/debian/changelog	2016-04-22 09:30:08.000000000 +0300
+++ base-files-9.6ubuntu2/debian/changelog	2016-06-14 15:18:00.000000000 +0300
@@ -1,3 +1,13 @@
+base-files (9.6ubuntu2) xenial; urgency=medium
+
+  * Exec uname from 00-header only once, cuts the exec time in half.
+  * Help is now consolidated on a single page, and there is no server
+    flavour anymore. Drastically simplify 10-help-text. LP: #771395.
+  * Drop lengthy copyright blurb from update-motd scripts to
+    debian/copyright.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 14 Jun 2016 14:49:54 +0300
+
 base-files (9.6ubuntu1) yakkety; urgency=medium
 
   * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Yakkety Yak!
diff -Nru base-files-9.6ubuntu1/debian/copyright.in base-files-9.6ubuntu2/debian/copyright.in
--- base-files-9.6ubuntu1/debian/copyright.in	2014-10-09 21:12:48.000000000 +0300
+++ base-files-9.6ubuntu2/debian/copyright.in	2016-06-14 15:14:56.000000000 +0300
@@ -26,3 +26,20 @@
 
 On Debian #OSNAME# systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
+
+update-motd.d/*
+
+Copyright (C) 2009-2016 Canonical Ltd.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+On Debian #OSNAME# systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
diff -Nru base-files-9.6ubuntu1/update-motd.d/00-header base-files-9.6ubuntu2/update-motd.d/00-header
--- base-files-9.6ubuntu1/update-motd.d/00-header	2015-10-22 20:15:21.000000000 +0300
+++ base-files-9.6ubuntu2/update-motd.d/00-header	2016-06-14 15:16:05.000000000 +0300
@@ -1,23 +1,4 @@
 #!/bin/sh
-#
-#    00-header - create the header of the MOTD
-#    Copyright (C) 2009-2010 Canonical Ltd.
-#
-#    Authors: Dustin Kirkland <kirkland@canonical.com>
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License along
-#    with this program; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 [ -r /etc/lsb-release ] && . /etc/lsb-release
 
@@ -26,4 +7,8 @@
 	DISTRIB_DESCRIPTION=$(lsb_release -s -d)
 fi
 
-printf "Welcome to %s (%s %s %s)\n" "$DISTRIB_DESCRIPTION" "$(uname -o)" "$(uname -r)" "$(uname -m)"
+read -r KRELEASE MACHINE OS <<EOF
+$(uname -r -m -o)
+EOF
+
+printf "Welcome to %s (%s %s %s)\n\n" "$DISTRIB_DESCRIPTION" "$OS" "$KRELEASE" "$MACHINE"
diff -Nru base-files-9.6ubuntu1/update-motd.d/10-help-text base-files-9.6ubuntu2/update-motd.d/10-help-text
--- base-files-9.6ubuntu1/update-motd.d/10-help-text	2015-10-22 20:15:21.000000000 +0300
+++ base-files-9.6ubuntu2/update-motd.d/10-help-text	2016-06-14 15:12:51.000000000 +0300
@@ -1,35 +1,2 @@
 #!/bin/sh
-#
-#    10-help-text - print the help text associated with the distro
-#    Copyright (C) 2009-2010 Canonical Ltd.
-#
-#    Authors: Dustin Kirkland <kirkland@canonical.com>,
-#             Brian Murray <brian@canonical.com>
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License along
-#    with this program; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-[ -r /etc/lsb-release ] && . /etc/lsb-release
-
-if [ -z "$DISTRIB_RELEASE" ] && [ -x /usr/bin/lsb_release ]; then
-	# Fall back to using the very slow lsb_release utility
-	DISTRIB_RELEASE=$(lsb_release -sr)
-fi
-
-URL="https://help.ubuntu.com/"
-if uname -r | grep -qs "\-server"; then
-	URL="https://help.ubuntu.com/$DISTRIB_RELEASE/serverguide/C"
-fi
-
-printf "\n * Documentation:  %s\n" "$URL"
+printf "\n * Documentation:  https://help.ubuntu.com\n"