diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index d6d20fd..1e581c1 100644
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -1280,7 +1280,8 @@ acquire_sample_rows(Relation onerel, int elevel,
 	*totalrows = vac_estimate_reltuples(onerel, true,
 										totalblocks,
 										bs.m,
-										liverows);
+										liverows,
+										onerel->rd_rel->reltuples);
 	if (bs.m > 0)
 		*totaldeadrows = floor((deadrows / bs.m) * totalblocks + 0.5);
 	else
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 641c740..4bdf0c1 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -501,10 +501,10 @@ double
 vac_estimate_reltuples(Relation relation, bool is_analyze,
 					   BlockNumber total_pages,
 					   BlockNumber scanned_pages,
-					   double scanned_tuples)
+					   double scanned_tuples,
+					   double old_rel_tuples)
 {
 	BlockNumber old_rel_pages = relation->rd_rel->relpages;
-	double		old_rel_tuples = relation->rd_rel->reltuples;
 	double		old_density;
 	double		new_density;
 	double		multiplier;
diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c
index 7e46f9e..80304a6 100644
--- a/src/backend/commands/vacuumlazy.c
+++ b/src/backend/commands/vacuumlazy.c
@@ -396,7 +396,11 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 	double		num_tuples,
 				tups_vacuumed,
 				nkeep,
-				nunused;
+				nunused,
+				scanned_used_bytes,
+				scanned_possible_max_tups,
+				scanned_freespace,
+				total_freespace;
 	IndexBulkDeleteResult **indstats;
 	int			i;
 	PGRUsage	ru0;
@@ -414,6 +418,8 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 
 	empty_pages = vacuumed_pages = 0;
 	num_tuples = tups_vacuumed = nkeep = nunused = 0;
+	scanned_used_bytes = scanned_possible_max_tups = 0;
+	scanned_freespace = total_freespace = 0;
 
 	indstats = (IndexBulkDeleteResult **)
 		palloc0(nindexes * sizeof(IndexBulkDeleteResult *));
@@ -487,6 +493,10 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 		bool		has_dead_tuples;
 		TransactionId visibility_cutoff_xid = InvalidTransactionId;
 
+		/* FSM slot for the previous block should be well mainteined */
+		if (blkno > 0)
+			total_freespace += GetRecordedFreeSpace(onerel, blkno - 1);
+
 		if (blkno == next_not_all_visible_block)
 		{
 			/* Time to advance next_not_all_visible_block */
@@ -692,6 +702,7 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 		hastup = false;
 		prev_dead_count = vacrelstats->num_dead_tuples;
 		maxoff = PageGetMaxOffsetNumber(page);
+		scanned_possible_max_tups += maxoff;
 
 		/*
 		 * Note: If you change anything in the loop below, also look at
@@ -892,6 +903,8 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 		}
 
 		freespace = PageGetHeapFreeSpace(page);
+		scanned_freespace += freespace;
+		scanned_used_bytes += PageGetItemBytes(page);
 
 		/* mark page all-visible, if appropriate */
 		if (all_visible && !all_visible_according_to_vm)
@@ -969,15 +982,45 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 			RecordPageWithFreeSpace(onerel, blkno, freespace);
 	}
 
+	total_freespace += GetRecordedFreeSpace(onerel, nblocks - 1);
+
 	/* save stats for use later */
 	vacrelstats->scanned_tuples = num_tuples;
 	vacrelstats->tuples_deleted = tups_vacuumed;
 
-	/* now we can compute the new value for pg_class.reltuples */
-	vacrelstats->new_rel_tuples = vac_estimate_reltuples(onerel, false,
-														 nblocks,
-												  vacrelstats->scanned_pages,
-														 num_tuples);
+	{
+		double prev_ntuples = onerel->rd_rel->reltuples;
+
+		if (tups_vacuumed > num_tuples &&
+			(double)vacrelstats->scanned_pages / nblocks > 0.1)
+		{
+			/*
+			 * When certain amount of tuples are vacuumed, there might be
+			 * unignorable imballance in the number of tuples between scanned
+			 * pages and skipped ones. So we guess the number of tuples on the
+			 * skipped pages assuming the uniformity of tuple size among the
+			 * whole relation, and the correctness of FSM at this point.
+			 */
+			BlockNumber scanned_pages = vacrelstats->scanned_pages;
+			BlockNumber skipped_pages = nblocks - scanned_pages;
+			double buffer_max_bytes =
+				(scanned_used_bytes + scanned_freespace) / scanned_pages;
+			double skipped_freespace = total_freespace - scanned_freespace;
+			double mean_tup_len =
+				buffer_max_bytes / (scanned_possible_max_tups / scanned_pages);
+			double skipped_tups_per_blk =
+				(buffer_max_bytes - skipped_freespace / skipped_pages) /
+				mean_tup_len;
+			prev_ntuples = skipped_tups_per_blk * nblocks;
+		}
+
+		/* now we can compute the new value for pg_class.reltuples */
+		vacrelstats->new_rel_tuples = vac_estimate_reltuples(onerel, false,
+											nblocks,
+											vacrelstats->scanned_pages,
+											num_tuples,
+											prev_ntuples);
+	}
 
 	/*
 	 * Release any remaining pin on visibility map page.
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index d8dd8b0..aedc48e 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -147,7 +147,8 @@ extern void vac_close_indexes(int nindexes, Relation *Irel, LOCKMODE lockmode);
 extern double vac_estimate_reltuples(Relation relation, bool is_analyze,
 					   BlockNumber total_pages,
 					   BlockNumber scanned_pages,
-					   double scanned_tuples);
+					   double scanned_tuples,
+ 					   double old_rel_tuples);
 extern void vac_update_relstats(Relation relation,
 					BlockNumber num_pages,
 					double num_tuples,
diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h
index abcf8a0..aa067d9 100644
--- a/src/include/storage/bufpage.h
+++ b/src/include/storage/bufpage.h
@@ -233,6 +233,13 @@ typedef PageHeaderData *PageHeader;
 	((ItemId) (&((PageHeader) (page))->pd_linp[(offsetNumber) - 1]))
 
 /*
+ * PageGetItemBytes
+ *		Returns the size in bytes occupied by items data on the page
+ */
+#define PageGetItemBytes(page) \
+	(((PageHeader) (page))->pd_special - ((PageHeader) (page))->pd_upper)
+
+/*
  * PageGetContents
  *		To be used in case the page does not contain item pointers.
  *
