diff --git a/doc/src/sgml/fdwhandler.sgml b/doc/src/sgml/fdwhandler.sgml
index 6587678af2b..1e997c218b9 100644
--- a/doc/src/sgml/fdwhandler.sgml
+++ b/doc/src/sgml/fdwhandler.sgml
@@ -123,6 +123,14 @@ GetForeignRelSize(PlannerInfo *root,
should be replaced if at all possible. The function may also choose to
update baserel->width if it can compute a better estimate
of the average result row width.
+ (The initial value is based on column data types and on column
+ average-width values measured by the last ANALYZE.)
+ Also, this function may update baserel->tuples if
+ it can compute a better estimate of the foreign table's total row count.
+ (The initial value is
+ from pg_class.reltuples
+ which represents the total row count seen by the
+ last ANALYZE.)
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 58269374056..8e8f43735e0 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -911,6 +911,9 @@ set_foreign_size(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
/* ... but do not let it set the rows estimate to zero */
rel->rows = clamp_row_est(rel->rows);
+
+ /* also, make sure rel->tuples is not insane relative to rel->rows */
+ rel->tuples = Max(rel->tuples, rel->rows);
}
/*