diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 5561295e50..90cb9ab971 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -11059,6 +11059,11 @@ dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo)
 			NULL, fdwinfo->rolname,
 			fdwinfo->fdwacl);
 
+	/* Dump Foreign Data Wrapper Comments */
+	dumpComment(fout, labelq->data,
+				NULL, fdwinfo->rolname,
+				fdwinfo->dobj.catId, 0, fdwinfo->dobj.dumpId);
+
 	free(qfdwname);
 
 	destroyPQExpBuffer(q);
@@ -11163,6 +11168,11 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
 					 srvinfo->rolname,
 					 srvinfo->dobj.catId, srvinfo->dobj.dumpId);
 
+	/* Dump Foreign Server Comments */
+	dumpComment(fout, labelq->data,
+				NULL, srvinfo->rolname,
+				srvinfo->dobj.catId, 0, srvinfo->dobj.dumpId);
+
 	free(qsrvname);
 
 	destroyPQExpBuffer(q);