diff --git a/sys/alpha/include/asm.h b/sys/alpha/include/asm.h
index 782505cfae45..d4129aba050b 100644
--- a/sys/alpha/include/asm.h
+++ b/sys/alpha/include/asm.h
@@ -648,3 +648,9 @@ label:	ASCIZ msg;						\
 #endif
 
 #endif /* _KERNEL */
+
+#if !defined(lint) && !defined(STRIP_FBSDID)
+#define __FBSDID(s)	.ident s
+#else
+#define __FBSDID(s)	/* nothing */
+#endif /* not lint and not STRIP_FBSDID */
diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h
index 340b1701f7c1..cf5f767b33bd 100644
--- a/sys/amd64/include/asm.h
+++ b/sys/amd64/include/asm.h
@@ -101,6 +101,17 @@
 
 #define RCSID(x)	.text; .asciz x
 
+#undef __FBSDID
+#if !defined(lint) && !defined(STRIP_FBSDID)
+#ifdef __ELF__
+#define __FBSDID(s)	.ident s
+#else
+#define __FBSDID(s)	.data ;	.asciz s ; .previous
+#endif
+#else
+#define __FBSDID(s)	/* nothing */
+#endif /* not lint and not STRIP_FBSDID */
+
 #ifdef _ARCH_INDIRECT
 /*
  * Generate code to select between the generic functions and _ARCH_INDIRECT
diff --git a/sys/i386/include/asm.h b/sys/i386/include/asm.h
index 340b1701f7c1..cf5f767b33bd 100644
--- a/sys/i386/include/asm.h
+++ b/sys/i386/include/asm.h
@@ -101,6 +101,17 @@
 
 #define RCSID(x)	.text; .asciz x
 
+#undef __FBSDID
+#if !defined(lint) && !defined(STRIP_FBSDID)
+#ifdef __ELF__
+#define __FBSDID(s)	.ident s
+#else
+#define __FBSDID(s)	.data ;	.asciz s ; .previous
+#endif
+#else
+#define __FBSDID(s)	/* nothing */
+#endif /* not lint and not STRIP_FBSDID */
+
 #ifdef _ARCH_INDIRECT
 /*
  * Generate code to select between the generic functions and _ARCH_INDIRECT
diff --git a/sys/ia64/include/asm.h b/sys/ia64/include/asm.h
index 0eea68ce248c..7a49f2ce91fc 100644
--- a/sys/ia64/include/asm.h
+++ b/sys/ia64/include/asm.h
@@ -206,3 +206,9 @@ label:	ASCIZ msg;				\
 #endif
 
 #endif /* _KERNEL */
+
+#if !defined(lint) && !defined(STRIP_FBSDID)
+#define __FBSDID(s)	.ident s
+#else
+#define __FBSDID(s)	/* nothing */
+#endif /* not lint and not STRIP_FBSDID */
diff --git a/sys/powerpc/include/asm.h b/sys/powerpc/include/asm.h
index 951891de7b1e..0b15f9d68257 100644
--- a/sys/powerpc/include/asm.h
+++ b/sys/powerpc/include/asm.h
@@ -77,6 +77,12 @@
 
 #define	RCSID(x)	.text; .asciz x
 
+#if !defined(lint) && !defined(STRIP_FBSDID)
+#define __FBSDID(s)	.ident s
+#else
+#define __FBSDID(s)	/* nothing */
+#endif /* not lint and not STRIP_FBSDID */
+
 #ifdef __ELF__
 #define	WEAK_ALIAS(alias,sym)					\
 	.weak alias;						\
diff --git a/sys/sparc64/include/asm.h b/sys/sparc64/include/asm.h
index c9b5a7476217..694d3832ad48 100644
--- a/sys/sparc64/include/asm.h
+++ b/sys/sparc64/include/asm.h
@@ -97,4 +97,14 @@ CNAME(x):
 #define	ENTRY(x)	_ENTRY(x)
 #define	END(x)		.size x, . - x
 
+/*
+ * Kernel RCS ID tag and copyright macros
+ */
+
+#if !defined(lint) && !defined(STRIP_FBSDID)
+#define __FBSDID(s)	.ident s
+#else
+#define __FBSDID(s)	/* nothing */
+#endif /* not lint and not STRIP_FBSDID */
+
 #endif /* !_MACHINE_ASM_H_ */