diff --git a/solr/content.md b/solr/content.md
index 97ead3d3a492..17db6ee5e3ff 100644
--- a/solr/content.md
+++ b/solr/content.md
@@ -1,8 +1,18 @@
+# NOTE: Not vulnerable to Log4J 2 "Log4shell"
+
+Some Docker images *were* vulnerable to one of a pair of vulnerabilities in Log4J 2. But we have mitigated *[supported](https://hub.docker.com/_/solr?tab=tags)* images (and some others) and re-published them. You may need to re-pull the image you are using. For those images prior to 8.11.1, Solr is using a popular technique to mitigate the problem -- setting `log4j2.formatMsgNoLookups`. The Solr maintainers have deemed this adequate based specifically on how Solr uses logging; it won't be adequate for all projects that use Log4J. Scanning software might alert you to the presence of an older Log4J JAR file, however it can't know if your software (Solr) uses the artifacts in a vulnerable way. To validate the mitigation being in place, look for `-Dlog4j2.formatMsgNoLookups` in the Args section of Solr's front admin screen. As of Solr 8.11.1, Solr is using Log4J 2.16.0.
+
+References:
+
+-	[CVE-2021-44228](https://nvd.nist.gov/vuln/detail/CVE-2021-44228): Solr *was* vulnerable to this.
+-	[CVE-2021-45046](https://nvd.nist.gov/vuln/detail/CVE-2021-45046): Solr *never was* vulnerable to this.
+-	[Solr's security bulletin](https://solr.apache.org/security.html#apache-solr-affected-by-apache-log4j-cve-2021-44228)
+
 # What is Solr?
 
-Solr is highly reliable, scalable and fault tolerant, providing distributed indexing, replication and load-balanced querying, automated failover and recovery, centralized configuration and more. Solr powers the search and navigation features of many of the world's largest internet sites.
+Solr is the popular, blazing fast, open source NoSQL search platform from the Apache Lucene project. Its major features include powerful full-text search, hit highlighting, faceted search, dynamic clustering, database integration, rich document handling, and geospatial search. Solr is highly scalable, providing fault tolerant distributed search and indexing, and powers the search and navigation features of many of the world's largest internet sites.
 
-Learn more on [Apache Solr homepage](http://lucene.apache.org/solr/) and in the [Apache Solr Reference Guide](https://www.apache.org/dyn/closer.cgi/lucene/solr/ref-guide/).
+Learn more on [Apache Solr homepage](http://solr.apache.org/) and in the [Apache Solr Reference Guide](https://solr.apache.org/guide/).
 
 %%LOGO%%
 
diff --git a/solr/get-help.md b/solr/get-help.md
index 31ab6716cf5d..2e19035bf5b5 100644
--- a/solr/get-help.md
+++ b/solr/get-help.md
@@ -1 +1 @@
-[the Solr Community](https://lucene.apache.org/solr/community.html)
+[the Solr Community](https://solr.apache.org/community.html)
diff --git a/solr/license.md b/solr/license.md
index 7f9d73d4b277..6d1c2be75f90 100644
--- a/solr/license.md
+++ b/solr/license.md
@@ -2,7 +2,7 @@ Solr is licensed under the [Apache License, Version 2.0](https://www.apache.org/
 
 This repository is also licensed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0).
 
-Copyright 2015-2020 The Apache Software Foundation
+Copyright 2015-2021 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
 
diff --git a/solr/maintainer.md b/solr/maintainer.md
index 091c3b5ad823..c46a37a53d88 100644
--- a/solr/maintainer.md
+++ b/solr/maintainer.md
@@ -1 +1 @@
-[the Apache Lucene/Solr project](%%GITHUB-REPO%%)
+[the Apache Solr project](%%GITHUB-REPO%%)