diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 9ab282a76d1..f1a950a4e12 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -6795,6 +6743,12 @@ LockBufferForCleanup(Buffer buffer)
 				{
 					LogRecoveryConflict(RECOVERY_CONFLICT_BUFFERPIN,
 									waitStart, now, NULL, true);
+					ereport(LOG,
+							errmsg("recovery conflict waiting on buffer pin: rel %u/%u/%u blk %u",
+								   bufHdr->tag.spcOid,
+								   bufHdr->tag.dbOid,
+								   BufTagGetRelNumber(&bufHdr->tag),
+								   bufHdr->tag.blockNum));
 					logged_recovery_conflict = true;
 				}
 			}
@@ -6844,9 +6798,17 @@ cleanup_lock_acquired:
 	 * but the startup process waited longer than deadlock_timeout for it.
 	 */
 	if (logged_recovery_conflict)
+	{
 		LogRecoveryConflict(RECOVERY_CONFLICT_BUFFERPIN,
 							waitStart, GetCurrentTimestamp(),
 							NULL, false);
+		ereport(LOG,
+				(errmsg("recovery conflict on buffer pin resolved: rel %u/%u/%u blk %u",
+						bufHdr->tag.spcOid,
+						bufHdr->tag.dbOid,
+						BufTagGetRelNumber(&bufHdr->tag),
+						bufHdr->tag.blockNum)));
+	}
 
 	if (waiting)
 	{