diff -Nru update-motd-1.7/debian/changelog update-motd-1.8/debian/changelog
--- update-motd-1.7/debian/changelog	2008-09-19 18:31:17.000000000 -0500
+++ update-motd-1.8/debian/changelog	2008-09-30 17:36:23.000000000 -0500
@@ -1,3 +1,12 @@
+update-motd (1.8) intrepid; urgency=low
+
+  * update-motd: on disable, regenerate a motd that does not have the possibly
+    stale update-motd data in it; on enable, run update-motd immediately
+    (LP: #276539)
+  * update-motd.1: update the manpage accordingly
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 30 Sep 2008 17:36:18 -0500
+
 update-motd (1.7) intrepid; urgency=low
 
   * Packaging suggestions (LP: #271848)
diff -Nru update-motd-1.7/update-motd update-motd-1.8/update-motd
--- update-motd-1.7/update-motd	2008-09-19 18:31:17.000000000 -0500
+++ update-motd-1.8/update-motd	2008-09-30 17:28:43.000000000 -0500
@@ -64,12 +64,17 @@
 		"--disable"|"-d")
 			touch "$DISABLED"
 			echo "$NAME is now disabled." 1>&2
+			# Regenerate motd created at boot by
+			# /etc/init.d/bootmisc.sh
+			uname -snrvm > $REAL
+			[ -f $SKEL ] && cat $SKEL >> $REAL
 			exit 0
 		;;
 		"--enable"|"-e")
 			rm -f "$DISABLED"
 			echo "$NAME is now enabled." 1>&2
-			exit 0
+			# Do not exit here, as we want to update the MOTD
+			# immediately upon enabling
 		;;
 		"--force"|"-f")
 			FORCE=1
diff -Nru update-motd-1.7/update-motd.1 update-motd-1.8/update-motd.1
--- update-motd-1.7/update-motd.1	2008-09-19 18:31:17.000000000 -0500
+++ update-motd-1.8/update-motd.1	2008-09-30 17:27:42.000000000 -0500
@@ -12,10 +12,10 @@
 .IX Header "OPTIONS"
 .TP
 \fB\-\-disable\fP
-Prevent update-motd from running. This is useful for temporarily disabling automatic updates of \fI/etc/motd\fP by the \fI/etc/cron.d/update-motd\fP cronjob.  Note that this exits immediately after disabling, and does update the MOTD.
+Prevent update-motd from running. This is useful for temporarily disabling automatic updates of \fI/etc/motd\fP by the \fI/etc/cron.d/update-motd\fP cronjob.  Note that this regenerates a base MOTD without the update-motd additions, and then exits.
 .TP
 \fB\-\-enable\fP
-Allow update-motd to run.  This is useful for enabling automatic updates of \fI/etc/motd\fP through the \fI/etc/cron.d/update-motd\fP cronjob.  Note that this exits immediately after enabling, and does update the MOTD.
+Allow update-motd to run.  This is useful for enabling automatic updates of \fI/etc/motd\fP through the \fI/etc/cron.d/update-motd\fP cronjob.  Note that this updates the MOTD immediately.
 .TP
 \fB\-\-force\fP
 Override a disabled update-motd for a single, immediate update of \fI/etc/motd\fP.