diff --git a/src/catalog.c b/src/catalog.c
index 16b326a2..43d78f6a 100644
--- a/src/catalog.c
+++ b/src/catalog.c
@@ -394,7 +394,8 @@ pgBackupWriteControl(FILE *out, pgBackup *backup)
 	fprintf(out, "block-size = %u\n", backup->block_size);
 	fprintf(out, "xlog-block-size = %u\n", backup->wal_block_size);
 	fprintf(out, "checksum-version = %u\n", backup->checksum_version);
-	fprintf(out, "server-version = %s\n", backup->server_version);
+	if (backup->server_version[0] != '\0')
+		fprintf(out, "server-version = %s\n", backup->server_version);
 
 	fprintf(out, "\n#Result backup info\n");
 	fprintf(out, "timelineid = %d\n", backup->tli);
diff --git a/src/show.c b/src/show.c
index ca899769..29418aa3 100644
--- a/src/show.c
+++ b/src/show.c
@@ -257,7 +257,7 @@ show_backup_list(FILE *out, parray *backup_list)
 		parent_tli = get_parent_tli(backup->tli);
 		backup_id = base36enc(backup->start_time);
 
-		fprintf(out, " %-11s %-8s %-6s  %-19s  %-6s  %-7s  %3d / %-3d            %5s  %6s  %2X/%-8X  %2X/%-8X  %-8s\n",
+		fprintf(out, " %-11s %-8s %-6s  %-22s  %-6s  %-7s  %3d / %-3d            %5s  %6s  %2X/%-8X  %2X/%-8X  %-8s\n",
 				instance_name,
 				(backup->server_version[0] ? backup->server_version : "----"),
 				backup_id,