Index: head/lib/libc/stdlib/jemalloc/Makefile.inc
===================================================================
--- head/lib/libc/stdlib/jemalloc/Makefile.inc	(revision 365372)
+++ head/lib/libc/stdlib/jemalloc/Makefile.inc	(revision 365373)
@@ -1,50 +1,50 @@
 # $FreeBSD$
 
 .PATH: ${LIBC_SRCTOP}/stdlib/jemalloc
 
 JEMALLOCSRCS:= jemalloc.c arena.c background_thread.c base.c bin.c bitmap.c \
 	ckh.c ctl.c div.c extent.c extent_dss.c extent_mmap.c hash.c hook.c \
 	large.c log.c malloc_io.c mutex.c mutex_pool.c nstime.c pages.c \
 	prng.c prof.c rtree.c safety_check.c sc.c stats.c sz.c tcache.c \
 	test_hooks.c ticker.c tsd.c witness.c
 
 SYM_MAPS+=${LIBC_SRCTOP}/stdlib/jemalloc/Symbol.map
 
 CFLAGS+=-I${SRCTOP}/contrib/jemalloc/include
 
 .for src in ${JEMALLOCSRCS}
 MISRCS+=jemalloc_${src}
 CLEANFILES+=jemalloc_${src}
 jemalloc_${src}: ${SRCTOP}/contrib/jemalloc/src/${src} .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 .endfor
 
 MAN+=jemalloc.3
 CLEANFILES+=jemalloc.3
 jemalloc.3: ${SRCTOP}/contrib/jemalloc/doc/jemalloc.3 .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 MLINKS+= \
 	jemalloc.3 malloc.3 \
 	jemalloc.3 calloc.3 \
 	jemalloc.3 posix_memalign.3 \
 	jemalloc.3 aligned_alloc.3 \
 	jemalloc.3 realloc.3 \
 	jemalloc.3 free.3 \
 	jemalloc.3 malloc_usable_size.3 \
 	jemalloc.3 malloc_stats_print.3 \
 	jemalloc.3 mallctl.3 \
 	jemalloc.3 mallctlnametomib.3 \
 	jemalloc.3 mallctlbymib.3 \
 	jemalloc.3 mallocx.3 \
 	jemalloc.3 rallocx.3 \
 	jemalloc.3 xallocx.3 \
 	jemalloc.3 sallocx.3 \
 	jemalloc.3 dallocx.3 \
 	jemalloc.3 sdallocx.3 \
 	jemalloc.3 nallocx.3 \
 	jemalloc.3 malloc.conf.5
 
-.if ${MK_MALLOC_PRODUCTION} != "no"
+.if ${MK_MALLOC_PRODUCTION} != "no" || defined(MALLOC_PRODUCTION)
 CFLAGS+=	-DMALLOC_PRODUCTION
 .endif
Index: head/tools/build/options/WITHOUT_MALLOC_PRODUCTION
===================================================================
--- head/tools/build/options/WITHOUT_MALLOC_PRODUCTION	(revision 365372)
+++ head/tools/build/options/WITHOUT_MALLOC_PRODUCTION	(revision 365373)
@@ -1,5 +1,4 @@
 .\" $FreeBSD$
 Set to enable assertions and statistics gathering in
 .Xr malloc 3 .
 It also defaults the A and J runtime options to on.
-Enabled by default on -CURRENT.
Index: head/tools/build/options/WITH_MALLOC_PRODUCTION
===================================================================
--- head/tools/build/options/WITH_MALLOC_PRODUCTION	(revision 365372)
+++ head/tools/build/options/WITH_MALLOC_PRODUCTION	(revision 365373)
@@ -1,5 +1,4 @@
 .\" $FreeBSD$
 Set to disable assertions and statistics gathering in
 .Xr malloc 3 .
 It also defaults the A and J runtime options to off.
-Disabled by default on -CURRENT.