Index: lib/csu/Makefile.inc
===================================================================
--- lib/csu/Makefile.inc
+++ lib/csu/Makefile.inc
@@ -19,7 +19,6 @@
 
 ACFLAGS+=	-DLOCORE
 
-CFLAGS+=	-DSTRIP_FBSDID
 CFLAGS+=	-fno-asynchronous-unwind-tables
 CFLAGS+=	-fno-omit-frame-pointer
 CFLAGS+=	-I${.CURDIR:H}/common \
Index: lib/libc/Makefile
===================================================================
--- lib/libc/Makefile
+++ lib/libc/Makefile
@@ -21,10 +21,9 @@
 LIBC_ARCH=${MACHINE_CPUARCH}
 .endif
 
-# All library objects contain FreeBSD revision strings by default; they may be
-# excluded as a space-saving measure.  To produce a library that does
-# not contain these strings, add -DSTRIP_FBSDID (see <sys/cdefs.h>) to CFLAGS
-# below.  Note: there are no IDs for syscall stubs whose sources are generated.
+# Library objects can have FreeBSD revision strings ($FreeBSD$) embedded by
+# adding -D__EMBED_FBSDID (see <sys/cdefs.h>) to CFLAGS below.
+# Note: there are no IDs for syscall stubs whose sources are generated.
 # To include legacy CSRG SCCS ID strings, remove -DNO__SCCSID from CFLAGS.
 # To include RCS ID strings from other BSD projects, remove -DNO__RCSID from CFLAGS.
 CFLAGS+=-DNO__SCCSID -DNO__RCSID
Index: sys/amd64/include/asm.h
===================================================================
--- sys/amd64/include/asm.h
+++ sys/amd64/include/asm.h
@@ -103,10 +103,10 @@
 #define RCSID(x)	.text; .asciz x
 
 #undef __FBSDID
-#if !defined(STRIP_FBSDID)
+#if defined(__EMBED_FBSDID)
 #define __FBSDID(s)	.ident s
 #else
 #define __FBSDID(s)	/* nothing */
-#endif /* !STRIP_FBSDID */
+#endif /* __EMBED_FBSDID */
 
 #endif /* !_MACHINE_ASM_H_ */
Index: sys/arm/include/asm.h
===================================================================
--- sys/arm/include/asm.h
+++ sys/arm/include/asm.h
@@ -163,7 +163,7 @@
 #endif	/* PIC */
 
 #undef __FBSDID
-#if !defined(lint) && !defined(STRIP_FBSDID)
+#if !defined(lint) && defined(__EMBED_FBSDID)
 #define __FBSDID(s)     .ident s
 #else
 #define __FBSDID(s)     /* nothing */
Index: sys/arm64/include/asm.h
===================================================================
--- sys/arm64/include/asm.h
+++ sys/arm64/include/asm.h
@@ -30,7 +30,7 @@
 #define	_MACHINE_ASM_H_
 
 #undef __FBSDID
-#if !defined(lint) && !defined(STRIP_FBSDID)
+#if !defined(lint) && defined(__EMBED_FBSDID)
 #define	__FBSDID(s)     .ident s
 #else
 #define	__FBSDID(s)     /* nothing */
Index: sys/i386/include/asm.h
===================================================================
--- sys/i386/include/asm.h
+++ sys/i386/include/asm.h
@@ -124,10 +124,10 @@
 #define RCSID(x)	.text; .asciz x
 
 #undef __FBSDID
-#if !defined(STRIP_FBSDID)
+#if defined(__EMBED_FBSDID)
 #define __FBSDID(s)	.ident s
 #else
 #define __FBSDID(s)	/* nothing */
-#endif /* not STRIP_FBSDID */
+#endif /* __EMBED_FBSDID */
 
 #endif /* !_MACHINE_ASM_H_ */
Index: sys/mips/include/asm.h
===================================================================
--- sys/mips/include/asm.h
+++ sys/mips/include/asm.h
@@ -64,7 +64,7 @@
 #include <machine/cdefs.h>
 
 #undef __FBSDID
-#if !defined(lint) && !defined(STRIP_FBSDID)
+#if !defined(lint) && defined(__EMBED_FBSDID)
 #define	__FBSDID(s)	.ident s
 #else
 #define	__FBSDID(s)	/* nothing */
Index: sys/powerpc/include/asm.h
===================================================================
--- sys/powerpc/include/asm.h
+++ sys/powerpc/include/asm.h
@@ -247,11 +247,11 @@
 #define	RCSID(x)	.text; .asciz x
 
 #undef __FBSDID
-#if !defined(lint) && !defined(STRIP_FBSDID)
+#if !defined(lint) && defined(__EMBED_FBSDID)
 #define __FBSDID(s)	.ident s
 #else
 #define __FBSDID(s)	/* nothing */
-#endif /* not lint and not STRIP_FBSDID */
+#endif /* not lint and __EMBED_FBSDID */
 
 #define	WEAK_REFERENCE(sym, alias)				\
 	.weak alias;						\
Index: sys/riscv/include/asm.h
===================================================================
--- sys/riscv/include/asm.h
+++ sys/riscv/include/asm.h
@@ -38,11 +38,11 @@
 #define	_MACHINE_ASM_H_
 
 #undef __FBSDID
-#if !defined(lint) && !defined(STRIP_FBSDID)
+#if !defined(lint) && defined(__EMBED_FBSDID)
 #define	__FBSDID(s)	.ident s
 #else
 #define	__FBSDID(s)	/* nothing */
-#endif /* not lint and not STRIP_FBSDID */
+#endif /* not lint and __EMBED_FBSDID */
 
 #define	_C_LABEL(x)	x
 
Index: sys/sys/cdefs.h
===================================================================
--- sys/sys/cdefs.h
+++ sys/sys/cdefs.h
@@ -580,7 +580,7 @@
  *	__FBSDID("$FreeBSD$");
  */
 #ifndef	__FBSDID
-#if !defined(STRIP_FBSDID)
+#if defined(__EMBED_FBSDID)
 #define	__FBSDID(s)	__IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
 #else
 #define	__FBSDID(s)	struct __hack
Index: usr.sbin/lpr/common_source/lp.cdefs.h
===================================================================
--- usr.sbin/lpr/common_source/lp.cdefs.h
+++ usr.sbin/lpr/common_source/lp.cdefs.h
@@ -87,7 +87,7 @@
  * handle rcs id's.
  */
 #if !defined(__FBSDID)
-#  if defined(lint) || defined(STRIP_FBSDID)
+#  if defined(lint) || !defined(__EMBED_FBSDID)
 #    define	__FBSDID(s)	struct skip_rcsid_struct
 #  elif defined(__IDSTRING)			/* NetBSD */
 #    define	__FBSDID(s)	__IDSTRING(rcsid,s)