diff --git a/templates/pages/about/press/faq.html b/templates/pages/about/press/faq.html
index dc0caa4a..05f8ac3d 100644
--- a/templates/pages/about/press/faq.html
+++ b/templates/pages/about/press/faq.html
@@ -14,7 +14,7 @@ A: The next release of PostgreSQL will be version 11, and will follow a two-part
 A: Because of the long history of our project the first two decimals are major releases.  Thus 9.6, 9.5 etc. were all major releases.  Minor releases have numbers like 9.6.6. Since version 10, the project has adopted a two-part version numbering scheme.</p>
 
 <p><strong>Q: How is PostgreSQL licensed? How much does it cost?</strong><br />
-A: PostgreSQL is released under the OSI-approved PostgreSQL License.  There is no fee, even for use in commercial software products.  Please see <a href="/about/licence/">the PostgreSQL License</a></p>
+A: PostgreSQL is released under the OSI-approved PostgreSQL License.  There is no fee, even for use in commercial software products.  Please see <a href="/about/licence/">the PostgreSQL License</a>.</p>
 
 <p><strong>Q: How many developers work on PostgreSQL?</strong><br />
 A: About 200.  As with other open source projects, of course, we depend on hundreds of community members for documentation, translations, advocacy, conferences, website development, infrastructure, and peer-to-peer support.</p>
@@ -52,11 +52,11 @@ A: To date there is one: a <a href="http://www.spec.org/jAppServer2004/results/r
 <p><strong>Q: When will PostgreSQL get database server clustering?</strong><br />
 A: We already have it.  Since no one type of clustering satisfies all needs, we have several different clustering tools which take various clustering approaches.  The open source projects PostgresXC and Postgres-XL are available, as well as open source forks and proprietary tools such as Greenplum Database, Aster Data, CitusData and several others.  Also, PostgreSQL is supported by filesystem-based clustering systems for failover, including ones from Red Hat, Microsoft, Veritas and Oracle.</p>
 
-<p><strong>Q: When will 10 come out?</strong><br />
-A: The PostgreSQL project begins work on the next version of PostgreSQL in July of each year, and it generally takes 12 to 15 months to work to a release. So expect 10 around September 2017.  We are the only major SQL database which releases every year.</p>
+<p><strong>Q: When will PostgreSQL 11 come out?</strong><br />
+A: The PostgreSQL project begins work on the next version of PostgreSQL in July of each year, and it generally takes 12 to 15 months to work to a release. So expect version 11 around September 2018.</p>
 
-<p><strong>Q: What features will 10 have?</strong><br />
-A: As always, we can't be certain what will go in and what won't; the project has strict quality standards that not all patches can make before deadline.   All we can tell you is what's currently being worked on, which includes additional parallel operations, aggregation push-down for FDWs, built-in streaming logical replication with pg_logical, SCRAM authentication, improvements to continous backup, improved hash indexes, reduced Write-Ahead Logging, quorum commit for replicas, and several other features.  By the time 10 is released, though, this feature list will have changed considerably.</p>
+<p><strong>Q: What features will 11 have?</strong><br />
+A: As always, we can't be certain what will go in and what won't; the project has strict quality standards that not all patches can make before deadline. All we can tell you is what's currently being worked on, which includes numerous improvements to partitioning functionality, parallel B-tree index creation, covering indexes, JIT expression compilation support, channel binding for SCRAM authentication, performance improvements to adding a column with a non-NULL default value, and many other features.  By the time 11 is released, though, this feature may have changed considerably.</p>
 
 <p><strong>Q: How do you pronounce PostgreSQL</strong><br />
 A: post-GRES-que-ell, per this <a href="/files/postgresql.mp3">audio file</a>.  Many people, however, just say "post-GRES" or "post-GREZ".</p>