diff --git a/src/lib/util/cdrom.c b/src/lib/util/cdrom.c
index 0e0da82e1fb..17d6bf75c12 100644
--- a/src/lib/util/cdrom.c
+++ b/src/lib/util/cdrom.c
@@ -829,6 +829,9 @@ chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc)
 		track->pgsubsize = 0;
 		cdrom_convert_type_string_to_pregap_info(pgtype, track);
 		cdrom_convert_subtype_string_to_pregap_info(pgsub, track);
+
+        /* set the postgap info */
+        track->postgap = postgap;
 	}
 
 	/* if we got any tracks this way, we're done */
diff --git a/src/tools/chdman.c b/src/tools/chdman.c
index ab8c3557542..da19cde8312 100644
--- a/src/tools/chdman.c
+++ b/src/tools/chdman.c
@@ -1661,7 +1661,7 @@ static int do_extractcd(int argc, char *argv[], int param)
 				f %= 75;
 				m = s / 60;
 				s %= 60;
-				fprintf(outfile, "  POSTGAP %02d:%02d:%02d\n", m, s, f);
+				fprintf(outfile, "    POSTGAP %02d:%02d:%02d\n", m, s, f);
 			}
 		}
 		else