diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 43c4b7af7b0..7ae6dce26b4 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -4,11 +4,11 @@
# For more information on this file, please read the handbook section on
# Kernel Configuration Files:
#
-# http://www.freebsd.org/handbook/kernelconfig-config.html
+# http://www.FreeBSD.org/handbook/kernelconfig-config.html
#
# The handbook is also available locally in /usr/share/doc/handbook
# if you've installed the doc distribution, otherwise always see the
-# FreeBSD World Wide Web server (http://www.FreeBSD.ORG/) for the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
# latest information.
#
# An exhaustive list of options and more detailed explanations of the
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 43c4b7af7b0..7ae6dce26b4 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -4,11 +4,11 @@
# For more information on this file, please read the handbook section on
# Kernel Configuration Files:
#
-# http://www.freebsd.org/handbook/kernelconfig-config.html
+# http://www.FreeBSD.org/handbook/kernelconfig-config.html
#
# The handbook is also available locally in /usr/share/doc/handbook
# if you've installed the doc distribution, otherwise always see the
-# FreeBSD World Wide Web server (http://www.FreeBSD.ORG/) for the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
# latest information.
#
# An exhaustive list of options and more detailed explanations of the
diff --git a/sys/alpha/conf/SIMOS b/sys/alpha/conf/SIMOS
index b53a2107d8c..f1b04307f31 100644
--- a/sys/alpha/conf/SIMOS
+++ b/sys/alpha/conf/SIMOS
@@ -5,7 +5,7 @@
# Configuring the FreeBSD Kernel -> The Configuration File.
# The handbook is available in /usr/share/doc/handbook or online as
# latest version from the FreeBSD World Wide Web server
-#
+#
#
# An exhaustive list of options and more detailed explanations of the
# device lines is present in the ./LINT configuration file. If you are
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 0ab1f3a38dc..766484bdfb8 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -4,11 +4,11 @@
# For more information on this file, please read the handbook section on
# Kernel Configuration Files:
#
-# http://www.freebsd.org/handbook/kernelconfig-config.html
+# http://www.FreeBSD.org/handbook/kernelconfig-config.html
#
# The handbook is also available locally in /usr/share/doc/handbook
# if you've installed the doc distribution, otherwise always see the
-# FreeBSD World Wide Web server (http://www.FreeBSD.ORG/) for the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
# latest information.
#
# An exhaustive list of options and more detailed explanations of the
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 0ab1f3a38dc..766484bdfb8 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -4,11 +4,11 @@
# For more information on this file, please read the handbook section on
# Kernel Configuration Files:
#
-# http://www.freebsd.org/handbook/kernelconfig-config.html
+# http://www.FreeBSD.org/handbook/kernelconfig-config.html
#
# The handbook is also available locally in /usr/share/doc/handbook
# if you've installed the doc distribution, otherwise always see the
-# FreeBSD World Wide Web server (http://www.FreeBSD.ORG/) for the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
# latest information.
#
# An exhaustive list of options and more detailed explanations of the
diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD
index 5619d8c9437..254cc49b3a7 100644
--- a/sys/i386/conf/NEWCARD
+++ b/sys/i386/conf/NEWCARD
@@ -13,11 +13,11 @@
# For more information on this file, please read the handbook section on
# Kernel Configuration Files:
#
-# http://www.freebsd.org/handbook/kernelconfig-config.html
+# http://www.FreeBSD.org/handbook/kernelconfig-config.html
#
# The handbook is also available locally in /usr/share/doc/handbook
# if you've installed the doc distribution, otherwise always see the
-# FreeBSD World Wide Web server (http://www.FreeBSD.ORG/) for the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
# latest information.
#
# An exhaustive list of options and more detailed explanations of the