diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
new file mode 100644
index a02a8ec..0e70b6f
*** a/contrib/pg_upgrade/controldata.c
--- b/contrib/pg_upgrade/controldata.c
*************** check_control_data(ControlData *oldctrl,
*** 572,581 ****
  	 * We might eventually allow upgrades from checksum to no-checksum
  	 * clusters.
  	 */
! 	if (oldctrl->data_checksum_version != newctrl->data_checksum_version)
! 	{
! 		pg_fatal("old and new pg_controldata checksum versions are invalid or do not match\n");
! 	}
  }
  
  
--- 572,585 ----
  	 * We might eventually allow upgrades from checksum to no-checksum
  	 * clusters.
  	 */
! 	if (oldctrl->data_checksum_version == 0 &&
! 		newctrl->data_checksum_version != 0)
! 		pg_fatal("old cluster does not use data checksums but the new one does\n");
! 	else if (oldctrl->data_checksum_version != 0 &&
! 			 newctrl->data_checksum_version == 0)
! 		pg_fatal("old cluster uses data checksums but the new one does not\n");
! 	else if (oldctrl->data_checksum_version != newctrl->data_checksum_version)
! 		pg_fatal("old and new cluster pg_controldata checksum versions do not match\n");
  }