diff --git a/google/cloud/storage/async/options.h b/google/cloud/storage/async/options.h
index d979730dbac24..2637be6bab192 100644
--- a/google/cloud/storage/async/options.h
+++ b/google/cloud/storage/async/options.h
@@ -29,8 +29,13 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
  * checksum of an object during uploads and downloads.
  *
  * The option has no effect if the service does not return a CRC32C hash.
+ *
+ * @deprecated Use `UploadChecksumValidationOption` and
+ * `DownloadChecksumValidationOption` instead.
  */
-struct EnableCrc32cValidationOption {
+struct [[deprecated(
+    "Use UploadChecksumValidationOption and DownloadChecksumValidationOption "
+    "instead")]] EnableCrc32cValidationOption {
   using Type = bool;
 };
 
@@ -54,8 +59,13 @@ struct UseCrc32cValueOption {
  *
  * The option has no effect for partial downloads or any other circumstance
  * where the service does not return a MD5 hash.
+ *
+ * @deprecated Use `UploadChecksumValidationOption` and
+ * `DownloadChecksumValidationOption` instead.
  */
-struct EnableMD5ValidationOption {
+struct [[deprecated(
+    "Use UploadChecksumValidationOption and DownloadChecksumValidationOption "
+    "instead")]] EnableMD5ValidationOption {
   using Type = bool;
 };
 
diff --git a/google/cloud/storage/hashing_options.h b/google/cloud/storage/hashing_options.h
index 3fcac86aea5d4..d9c26edbc6b8f 100644
--- a/google/cloud/storage/hashing_options.h
+++ b/google/cloud/storage/hashing_options.h
@@ -15,8 +15,10 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_HASHING_OPTIONS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_HASHING_OPTIONS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/storage/internal/complex_option.h"
 #include "google/cloud/storage/version.h"
+#include "google/cloud/version.h"
 #include "absl/strings/string_view.h"
 #include <string>
 
@@ -70,8 +72,14 @@ inline std::string ComputeMD5Hash(char const* payload) {
  *   for most applications.  Disabling CRC32C checksums while MD5 hashes remain
  *   disabled exposes your application to data corruption. We recommend that all
  *   uploads to GCS and downloads from GCS use CRC32C checksums.
+ *
+ * @deprecated Use `UploadChecksumValidationOption` and
+ * `DownloadChecksumValidationOption` instead.
  */
-struct DisableMD5Hash : public internal::ComplexOption<DisableMD5Hash, bool> {
+struct [[deprecated(
+    "Use UploadChecksumValidationOption and DownloadChecksumValidationOption "
+    "instead")]] DisableMD5Hash
+    : public internal::ComplexOption<DisableMD5Hash, bool> {
   using ComplexOption<DisableMD5Hash, bool>::ComplexOption;
   // GCC <= 7.0 does not use the inherited default constructor, redeclare it
   // explicitly
@@ -134,8 +142,13 @@ inline std::string ComputeCrc32cChecksum(char const* payload) {
  *   for most applications.  Disabling CRC32C checksums while MD5 hashes remain
  *   disabled exposes your application to data corruption. We recommend that all
  *   uploads to GCS and downloads from GCS use CRC32C checksums.
+ *
+ * @deprecated Use `UploadChecksumValidationOption` and
+ * `DownloadChecksumValidationOption` instead.
  */
-struct DisableCrc32cChecksum
+struct [[deprecated(
+    "Use UploadChecksumValidationOption and DownloadChecksumValidationOption "
+    "instead")]] DisableCrc32cChecksum
     : public internal::ComplexOption<DisableCrc32cChecksum, bool> {
   using ComplexOption<DisableCrc32cChecksum, bool>::ComplexOption;
   // GCC <= 7.0 does not use the inherited default constructor, redeclare it
@@ -149,4 +162,5 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloud
 }  // namespace google
 
+#include "google/cloud/internal/diagnostics_pop.inc"
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_HASHING_OPTIONS_H
diff --git a/google/cloud/storage/hashing_options_test.cc b/google/cloud/storage/hashing_options_test.cc
index 047731d655c6b..8bd3ec50dc388 100644
--- a/google/cloud/storage/hashing_options_test.cc
+++ b/google/cloud/storage/hashing_options_test.cc
@@ -13,6 +13,8 @@
 // limitations under the License.
 
 #include "google/cloud/storage/hashing_options.h"
+#include "google/cloud/storage/options.h"
+#include "google/cloud/options.h"
 #include <gmock/gmock.h>
 #include <string>
 
@@ -54,6 +56,23 @@ TEST(ComputeCrc32cChecksumTest, Simple) {
   EXPECT_EQ("ImIEBA==", actual);
 }
 
+TEST(ChecksumOptionsTest, SetAndGet) {
+  Options options;
+  EXPECT_FALSE(options.has<UploadChecksumValidationOption>());
+  EXPECT_FALSE(options.has<DownloadChecksumValidationOption>());
+
+  options.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kMD5);
+  options.set<DownloadChecksumValidationOption>(ChecksumAlgorithm::kCrc32c);
+
+  EXPECT_TRUE(options.has<UploadChecksumValidationOption>());
+  EXPECT_EQ(ChecksumAlgorithm::kMD5,
+            options.get<UploadChecksumValidationOption>());
+
+  EXPECT_TRUE(options.has<DownloadChecksumValidationOption>());
+  EXPECT_EQ(ChecksumAlgorithm::kCrc32c,
+            options.get<DownloadChecksumValidationOption>());
+}
+
 }  // namespace
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace storage
diff --git a/google/cloud/storage/internal/hash_function.h b/google/cloud/storage/internal/hash_function.h
index da7699353739f..0e17442acce05 100644
--- a/google/cloud/storage/internal/hash_function.h
+++ b/google/cloud/storage/internal/hash_function.h
@@ -15,6 +15,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_HASH_FUNCTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_HASH_FUNCTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/storage/hashing_options.h"
 #include "google/cloud/storage/internal/hash_values.h"
 #include "google/cloud/storage/version.h"
@@ -108,4 +109,5 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloud
 }  // namespace google
 
+#include "google/cloud/internal/diagnostics_pop.inc"
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_HASH_FUNCTION_H
diff --git a/google/cloud/storage/internal/object_requests.h b/google/cloud/storage/internal/object_requests.h
index 6fd14a86b841b..ee5598d5d49c1 100644
--- a/google/cloud/storage/internal/object_requests.h
+++ b/google/cloud/storage/internal/object_requests.h
@@ -15,6 +15,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_OBJECT_REQUESTS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_OBJECT_REQUESTS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/storage/auto_finalize.h"
 #include "google/cloud/storage/download_options.h"
 #include "google/cloud/storage/hashing_options.h"
@@ -645,4 +646,5 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloud
 }  // namespace google
 
+#include "google/cloud/internal/diagnostics_pop.inc"
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_OBJECT_REQUESTS_H
diff --git a/google/cloud/storage/options.h b/google/cloud/storage/options.h
index f64f5d1f28e51..649c717e2c45e 100644
--- a/google/cloud/storage/options.h
+++ b/google/cloud/storage/options.h
@@ -70,6 +70,43 @@ struct CAPathOption {
 
 }  // namespace internal
 
+/**
+ * Supported checksum algorithms.
+ *
+ * @ingroup storage-options
+ */
+enum class ChecksumAlgorithm {
+  kNone,    ///< Disable checksum validation
+  kCrc32c,  ///< Use CRC32C for checksum validation
+  kMD5,     ///< Use MD5 for checksum validation
+};
+
+/**
+ * Configure the checksum algorithm used for uploads.
+ *
+ * If set, the client computes (if necessary) and validates the checksum of
+ * an object during uploads. Set to `ChecksumAlgorithm::kNone` to disable
+ * checksum validation.
+ *
+ * @ingroup storage-options
+ */
+struct UploadChecksumValidationOption {
+  using Type = ChecksumAlgorithm;
+};
+
+/**
+ * Configure the checksum algorithm used for downloads.
+ *
+ * If set, the client computes (if necessary) and validates the checksum of
+ * an object during downloads. Set to `ChecksumAlgorithm::kNone` to disable
+ * checksum validation.
+ *
+ * @ingroup storage-options
+ */
+struct DownloadChecksumValidationOption {
+  using Type = ChecksumAlgorithm;
+};
+
 /**
  * Configure the REST endpoint for the GCS client library.
  *
@@ -325,6 +362,7 @@ using ClientOptionList = ::google::cloud::OptionList<
     MaximumCurlSocketRecvSizeOption, MaximumCurlSocketSendSizeOption,
     TransferStallTimeoutOption, RetryPolicyOption, BackoffPolicyOption,
     IdempotencyPolicyOption, CARootsFilePathOption,
+    UploadChecksumValidationOption, DownloadChecksumValidationOption,
     storage_experimental::HttpVersionOption>;
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
diff --git a/google/cloud/storage/parallel_upload.h b/google/cloud/storage/parallel_upload.h
index 0d0e08db1b0ac..ae06bd1bbb6fe 100644
--- a/google/cloud/storage/parallel_upload.h
+++ b/google/cloud/storage/parallel_upload.h
@@ -15,6 +15,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_PARALLEL_UPLOAD_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_PARALLEL_UPLOAD_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/storage/client.h"
 #include "google/cloud/storage/internal/tuple_filter.h"
 #include "google/cloud/storage/object_stream.h"
@@ -1217,4 +1218,5 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloud
 }  // namespace google
 
+#include "google/cloud/internal/diagnostics_pop.inc"
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_PARALLEL_UPLOAD_H