diff --git a/UPDATING b/UPDATING
index dec494783fca..eb3520012ae9 100644
--- a/UPDATING
+++ b/UPDATING
@@ -21,6 +21,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW:
 	developers choose to disable these features on build machines
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
+
+20081219:
+	With __FreeBSD_version 800060 incorporates the makefs tool is
+	part of the base system (it was a port).
+
 20081216:
 	The afdata and ifnet locks have been changed from mutexes to 
 	rwlocks, network modules will need to be re-compiled.
diff --git a/sys/sys/param.h b/sys/sys/param.h
index f8a4b2a2b817..fad4d518a077 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -57,7 +57,7 @@
  *		is created, otherwise 1.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 800059	/* Master, propagated to newvers */
+#define __FreeBSD_version 800060	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include <sys/types.h>
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index b84f9e30f9ba..26da845b40e9 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -86,6 +86,7 @@ SUBDIR=	${_ac} \
 	${_lptcontrol} \
 	${_mailstats} \
 	mailwrapper \
+	makefs \
 	${_makemap} \
 	manctl \
 	memcontrol \