Index: UPGRADE-11.txt
===================================================================
--- UPGRADE-11.txt	(revision 403005)
+++ UPGRADE-11.txt	(working copy)
@@ -20,6 +20,13 @@
 ===
 ===========================================================
 
+From 11.7 to 11.8:
+ - The safe_asterisk script was previously not installed on top of an existing
+   version.  This caused bug-fixes in that script not to be deployed.  If your
+   safe_asterisk script is customized, be sure to keep your changes.  Custom
+   values for variables should be created in file(s) inside ASTETCDIR/startup.d/
+   See ASTERISK-21965.
+
 From 11.6 to 11.7:
 ConfBridge
  - ConfBridge now has the ability to set the language of announcements to the
Index: Makefile
===================================================================
--- Makefile	(revision 403005)
+++ Makefile	(working copy)
@@ -565,7 +565,7 @@
 bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall
 	$(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
 	$(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/"
-	if [ ! -f "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk" -a ! -f /sbin/launchd ]; then \
+	if [ ! -f /sbin/launchd ]; then \
 		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;s|__ASTERISK_LOG_DIR__|$(ASTLOGDIR)|;' > contrib/scripts/safe.tmp ; \
 		$(INSTALL) -m 755 contrib/scripts/safe.tmp "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk" ; \
 		rm -f contrib/scripts/safe.tmp ; \