diff --git a/Makefile b/Makefile
index a1480d0f285a8514f7f1d0c2f666b4611742390e..11d157af8c6c9f03621f6c8c3e3fb6fa9f04d32c 100644
--- a/Makefile
+++ b/Makefile
@@ -197,8 +197,7 @@ ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
 
 MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs main
 OTHER_SUBDIRS:=utils agi
-# Note: OTHER_SUBDIRS must be after MOD_SUBDIRS, because 'utils' uses files from 'main'
-SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
+SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
 SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
 SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
diff --git a/UPGRADE.txt b/UPGRADE.txt
index 09ba006eaa6bc33602a6257970ef7033560f88ff..bfe6f17115547ed849d807273bdf73c49ccb4f5d 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -43,6 +43,16 @@ If you would like to save your choices and have them applied against all
 builds, the file can be copied to '~/.asterisk.makeopts' or 
 '/etc/asterisk.makeopts'.
 
+Build Process (Makefile targets):
+
+The 'valgrind' and 'dont-optimize' targets have been removed; their functionality
+is available by enabling the DONT_OPTIMIZE setting in the 'Compiler Flags' menu
+in the menuselect tool.
+
+It is now possible to run most make targets against a single subdirectory; from
+the top level directory, for example, 'make channels' will run 'make all' in the
+'channels' subdirectory. This also is true for 'clean', 'distclean' and 'depend'.
+
 Sound (prompt) and Music On Hold files:
 
 Beginning with Asterisk 1.4, the sound files and music on hold files supplied for