diff --git a/UPDATING b/UPDATING
index f2ba26c2c41f..6b1b78fceaa2 100644
--- a/UPDATING
+++ b/UPDATING
@@ -26,6 +26,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
 	world, or to merely disable the most expensive debugging functionality
 	at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20200923:
+	LINT files are no longer generated. We now include the relevant NOTES
+	files. Note: This may cause conflicts with updating in some cases.
+	        find sys -name LINT\* -rm
+	is suggested across this commit	to remove the generated	LINT files.
+
+	If you have tried to update with generated files there, the svn
+	command you want to un-auger the tree is
+		cd sys/amd64/conf
+		svn revert -R .
+	and then do the above find from the top level. Substitute 'amd64'
+	above with where the error message indicates a conflict.
+
 20200824:
 	OpenZFS support has been integrated. Do not upgrade root pools until
 	the loader is updated to support zstd. Furthermore, we caution against
diff --git a/sys/amd64/conf/LINT b/sys/amd64/conf/LINT
new file mode 100644
index 000000000000..9618f78944ab
--- /dev/null
+++ b/sys/amd64/conf/LINT
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+include "../../conf/NOTES"
+include "../../x86/conf/NOTES"
+include NOTES
diff --git a/sys/amd64/conf/LINT-NOINET b/sys/amd64/conf/LINT-NOINET
new file mode 100644
index 000000000000..2e4366ef8996
--- /dev/null
+++ b/sys/amd64/conf/LINT-NOINET
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+include LINT
+ident LINT-NOINET
+makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="
+nooptions INET
+nodevice gre
+nodevice netmap
diff --git a/sys/amd64/conf/LINT-NOINET6 b/sys/amd64/conf/LINT-NOINET6
new file mode 100644
index 000000000000..ffb275fd68d9
--- /dev/null
+++ b/sys/amd64/conf/LINT-NOINET6
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+include LINT
+ident LINT-NOINET6
+makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="
+nooptions INET6
diff --git a/sys/amd64/conf/LINT-NOIP b/sys/amd64/conf/LINT-NOIP
new file mode 100644
index 000000000000..bb306691388a
--- /dev/null
+++ b/sys/amd64/conf/LINT-NOIP
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+include LINT
+ident LINT-NOIP
+makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="
+makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="
+nooptions INET
+nooptions INET6
+nodevice age
+nodevice alc
+nodevice ale
+nodevice bxe
+nodevice em
+nodevice fxp
+nodevice jme
+nodevice msk
+nodevice mxge
+nodevice sge
+nodevice sk
+nodevice txp
+nodevice netmap
diff --git a/sys/amd64/conf/Makefile b/sys/amd64/conf/Makefile
deleted file mode 100644
index 735e33c8af9c..000000000000
--- a/sys/amd64/conf/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-TARGET=amd64
-
-NOTES=	${.CURDIR}/../../x86/conf/NOTES
-.include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/arm/conf/LINT b/sys/arm/conf/LINT
new file mode 100644
index 000000000000..aaba324bf49a
--- /dev/null
+++ b/sys/arm/conf/LINT
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+include "../../conf/NOTES"
+include NOTES
diff --git a/sys/arm/conf/Makefile b/sys/arm/conf/Makefile
deleted file mode 100644
index a6b24ffb8b40..000000000000
--- a/sys/arm/conf/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-TARGET=arm
-
-.include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/arm64/conf/LINT b/sys/arm64/conf/LINT
new file mode 100644
index 000000000000..aaba324bf49a
--- /dev/null
+++ b/sys/arm64/conf/LINT
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+include "../../conf/NOTES"
+include NOTES
diff --git a/sys/arm64/conf/Makefile b/sys/arm64/conf/Makefile
deleted file mode 100644
index 5b01233d605c..000000000000
--- a/sys/arm64/conf/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-TARGET=arm64
-
-.include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
new file mode 100644
index 000000000000..9618f78944ab
--- /dev/null
+++ b/sys/i386/conf/LINT
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+include "../../conf/NOTES"
+include "../../x86/conf/NOTES"
+include NOTES
diff --git a/sys/i386/conf/LINT-NOINET b/sys/i386/conf/LINT-NOINET
new file mode 100644
index 000000000000..2e4366ef8996
--- /dev/null
+++ b/sys/i386/conf/LINT-NOINET
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+include LINT
+ident LINT-NOINET
+makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="
+nooptions INET
+nodevice gre
+nodevice netmap
diff --git a/sys/i386/conf/LINT-NOINET6 b/sys/i386/conf/LINT-NOINET6
new file mode 100644
index 000000000000..ffb275fd68d9
--- /dev/null
+++ b/sys/i386/conf/LINT-NOINET6
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+include LINT
+ident LINT-NOINET6
+makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="
+nooptions INET6
diff --git a/sys/i386/conf/LINT-NOIP b/sys/i386/conf/LINT-NOIP
new file mode 100644
index 000000000000..a1ea6fa3202a
--- /dev/null
+++ b/sys/i386/conf/LINT-NOIP
@@ -0,0 +1,20 @@
+# $FreeBSD$
+include LINT
+ident LINT-NOIP
+makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="
+makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="
+nooptions INET
+nooptions INET6
+nodevice age
+nodevice alc
+nodevice ale
+nodevice bxe
+nodevice em
+nodevice fxp
+nodevice jme
+nodevice msk
+nodevice mxge
+nodevice sge
+nodevice sk
+nodevice txp
+nodevice netmap
diff --git a/sys/i386/conf/Makefile b/sys/i386/conf/Makefile
deleted file mode 100644
index 0cbafedfaf16..000000000000
--- a/sys/i386/conf/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-TARGET=i386
-
-NOTES=	${.CURDIR}/../../x86/conf/NOTES
-.include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/powerpc/conf/LINT b/sys/powerpc/conf/LINT
new file mode 100644
index 000000000000..49cb4483a0f0
--- /dev/null
+++ b/sys/powerpc/conf/LINT
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+include "../../conf/NOTES"
+include NOTES
+machine		powerpc powerpc
+nodevice	mlx5
+nodevice	mlx5en
+nodevice	mlx5ib
+nooptions	RATELIMIT
diff --git a/sys/powerpc/conf/LINT64 b/sys/powerpc/conf/LINT64
new file mode 100644
index 000000000000..58e8a55f2199
--- /dev/null
+++ b/sys/powerpc/conf/LINT64
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+include "../../conf/NOTES"
+include NOTES
+machine		powerpc powerpc64
diff --git a/sys/powerpc/conf/Makefile b/sys/powerpc/conf/Makefile
deleted file mode 100644
index 562bc4693cde..000000000000
--- a/sys/powerpc/conf/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-TARGET=powerpc
-
-.include "${.CURDIR}/../../conf/makeLINT.mk"