diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 54a08e4102e1..74e445d9a673 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -1017,7 +1017,7 @@ copy_table_data(Relation NewHeap, Relation OldHeap, Relation OldIndex, bool verb
 	relform = (Form_pg_class) GETSTRUCT(reltup);
 
 	relform->relpages = num_pages;
-	relform->reltuples = num_tuples;
+	relform->reltuples = num_tuples - tups_recently_dead;
 
 	/* Don't update the stats for pg_class.  See swap_relation_files. */
 	if (RelationGetRelid(OldHeap) != RelationRelationId)
diff --git a/src/include/access/tableam.h b/src/include/access/tableam.h
index 8713e12cbfb9..d259a7b46fa3 100644
--- a/src/include/access/tableam.h
+++ b/src/include/access/tableam.h
@@ -1631,6 +1631,7 @@ table_relation_copy_data(Relation rel, const RelFileLocator *newrlocator)
  * Output parameters:
  * - *xid_cutoff - rel's new relfrozenxid value, may be invalid
  * - *multi_cutoff - rel's new relminmxid value, may be invalid
+ * - *num_tuples - stats, non-removable tuples for logging
  * - *tups_vacuumed - stats, for logging, if appropriate for AM
  * - *tups_recently_dead - stats, for logging, if appropriate for AM
  */
diff --git a/src/test/isolation/expected/vacuum-full-stats.out b/src/test/isolation/expected/vacuum-full-stats.out
new file mode 100644
index 000000000000..7b027711f855
--- /dev/null
+++ b/src/test/isolation/expected/vacuum-full-stats.out
@@ -0,0 +1,72 @@
+Parsed test spec with 2 sessions
+
+starting permutation: s2_vac_full s2_reltuples s1_query s2_update s2_reltuples s2_vac_full s1_commit s2_reltuples
+step s2_vac_full: VACUUM FULL stats;
+step s2_reltuples: SELECT reltuples FROM pg_class WHERE relname = 'stats';
+reltuples
+---------
+       10
+(1 row)
+
+step s1_query: 
+	START TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+    SELECT 1;
+
+?column?
+--------
+       1
+(1 row)
+
+step s2_update: UPDATE stats SET a = 1 WHERE a > 6;
+step s2_reltuples: SELECT reltuples FROM pg_class WHERE relname = 'stats';
+reltuples
+---------
+       10
+(1 row)
+
+step s2_vac_full: VACUUM FULL stats;
+step s1_commit: 
+    COMMIT;
+
+step s2_reltuples: SELECT reltuples FROM pg_class WHERE relname = 'stats';
+reltuples
+---------
+       10
+(1 row)
+
+
+starting permutation: s2_create_index s2_vac_full s2_reltuples s1_query s2_update s2_reltuples s2_vac_full s1_commit s2_reltuples
+step s2_create_index: CREATE INDEX ON stats (a);
+step s2_vac_full: VACUUM FULL stats;
+step s2_reltuples: SELECT reltuples FROM pg_class WHERE relname = 'stats';
+reltuples
+---------
+       10
+(1 row)
+
+step s1_query: 
+	START TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+    SELECT 1;
+
+?column?
+--------
+       1
+(1 row)
+
+step s2_update: UPDATE stats SET a = 1 WHERE a > 6;
+step s2_reltuples: SELECT reltuples FROM pg_class WHERE relname = 'stats';
+reltuples
+---------
+       10
+(1 row)
+
+step s2_vac_full: VACUUM FULL stats;
+step s1_commit: 
+    COMMIT;
+
+step s2_reltuples: SELECT reltuples FROM pg_class WHERE relname = 'stats';
+reltuples
+---------
+       10
+(1 row)
+
diff --git a/src/test/isolation/isolation_schedule b/src/test/isolation/isolation_schedule
index e3c669a29c7a..71358fa42c56 100644
--- a/src/test/isolation/isolation_schedule
+++ b/src/test/isolation/isolation_schedule
@@ -95,6 +95,7 @@ test: vacuum-no-cleanup-lock
 test: timeouts
 test: vacuum-concurrent-drop
 test: vacuum-conflict
+test: vacuum-full-stats
 test: vacuum-skip-locked
 test: stats
 test: horizons
diff --git a/src/test/isolation/specs/vacuum-full-stats.spec b/src/test/isolation/specs/vacuum-full-stats.spec
new file mode 100644
index 000000000000..1280b0dd975e
--- /dev/null
+++ b/src/test/isolation/specs/vacuum-full-stats.spec
@@ -0,0 +1,42 @@
+# Test that pg_class.reltuples is updated with the correct value after
+# a VACUUM FULL when there are concurrent transactions preventing
+# removal of some garbage tuples. The reltuples count should not
+# include these garbage tuples.
+
+setup
+{
+	CREATE TABLE stats (a INT);
+    INSERT INTO stats SELECT generate_series(1, 10);
+}
+
+teardown
+{
+	DROP TABLE IF EXISTS stats;
+}
+
+# Session 1 (s1) keeps an open transaction in repeatable read to
+# prevent VACUUM FULL in session 2 (s2) from removing some dead tuples
+# that session 1 should still see in its snapshot. Note that s1 needs
+# to run a query to initiate a snapshot.
+session s1
+step s1_query
+{
+	START TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+    SELECT 1;
+}
+step s1_commit
+{
+    COMMIT;
+}
+
+session s2
+step s2_update       { UPDATE stats SET a = 1 WHERE a > 6; } 
+step s2_vac_full     { VACUUM FULL stats; }
+step s2_reltuples    { SELECT reltuples FROM pg_class WHERE relname = 'stats'; }
+step s2_create_index { CREATE INDEX ON stats (a); }
+
+permutation s2_vac_full s2_reltuples s1_query s2_update s2_reltuples s2_vac_full s1_commit s2_reltuples
+
+# If the table has at least one index, then the index rebuild will set
+# reltuples after VACUUM FULL, so run a test with that too.
+permutation s2_create_index s2_vac_full s2_reltuples s1_query s2_update s2_reltuples s2_vac_full s1_commit s2_reltuples