diff --git a/Makefile b/Makefile
index 37f47a28..2a962fa7 100644
--- a/Makefile
+++ b/Makefile
@@ -157,7 +157,7 @@ libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \
 		   kernel-lib/raid56.o kernel-lib/tables.o \
 		   common/device-scan.o common/path-utils.o \
 		   common/utils.o libbtrfsutil/subvolume.o libbtrfsutil/stubs.o \
-		   crypto/hash.o crypto/xxhash.o
+		   crypto/hash.o crypto/xxhash.o crypto/sha224-256.o
 libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \
 	       crypto/crc32c.h kernel-lib/list.h kerncompat.h \
 	       kernel-lib/radix-tree.h kernel-lib/sizes.h kernel-lib/raid56.h \
diff --git a/cmds/inspect-dump-super.c b/cmds/inspect-dump-super.c
index 52636bd2..47f56f78 100644
--- a/cmds/inspect-dump-super.c
+++ b/cmds/inspect-dump-super.c
@@ -316,6 +316,7 @@ static bool is_valid_csum_type(u16 csum_type)
 	switch (csum_type) {
 	case BTRFS_CSUM_TYPE_CRC32:
 	case BTRFS_CSUM_TYPE_XXHASH:
+	case BTRFS_CSUM_TYPE_SHA256:
 		return true;
 	default:
 		return false;
diff --git a/crypto/hash.c b/crypto/hash.c
index dbabfadf..ee4c7f4e 100644
--- a/crypto/hash.c
+++ b/crypto/hash.c
@@ -1,6 +1,7 @@
 #include "crypto/hash.h"
 #include "crypto/crc32c.h"
 #include "crypto/xxhash.h"
+#include "crypto/sha.h"
 
 int hash_crc32c(const u8* buf, size_t length, u8 *out)
 {
@@ -25,3 +26,14 @@ int hash_xxhash(const u8 *buf, size_t length, u8 *out)
 
 	return 0;
 }
+
+int hash_sha256(const u8 *buf, size_t len, u8 *out)
+{
+	SHA256Context context;
+
+	SHA256Reset(&context);
+	SHA256Input(&context, buf, len);
+	SHA256Result(&context, out);
+
+	return 0;
+}
diff --git a/crypto/hash.h b/crypto/hash.h
index 7298d69d..49d58654 100644
--- a/crypto/hash.h
+++ b/crypto/hash.h
@@ -7,5 +7,6 @@
 
 int hash_crc32c(const u8 *buf, size_t length, u8 *out);
 int hash_xxhash(const u8 *buf, size_t length, u8 *out);
+int hash_sha256(const u8 *buf, size_t length, u8 *out);
 
 #endif
diff --git a/crypto/sha224-256.c b/crypto/sha224-256.c
index 82124a03..f38cee18 100644
--- a/crypto/sha224-256.c
+++ b/crypto/sha224-256.c
@@ -40,8 +40,8 @@
  *   to hash the final few bits of the input.
  */
 
-#include "tests/sha.h"
-#include "tests/sha-private.h"
+#include "crypto/sha.h"
+#include "crypto/sha-private.h"
 
 /* Define the SHA shift, rotate left, and rotate right macros */
 #define SHA256_SHR(bits,word)      ((word) >> (bits))
diff --git a/ctree.c b/ctree.c
index d1680a6a..19052e8e 100644
--- a/ctree.c
+++ b/ctree.c
@@ -44,6 +44,7 @@ static const struct btrfs_csum {
 } btrfs_csums[] = {
 	[BTRFS_CSUM_TYPE_CRC32]		= {  4, "crc32c" },
 	[BTRFS_CSUM_TYPE_XXHASH]	= {  8, "xxhash64" },
+	[BTRFS_CSUM_TYPE_SHA256]	= { 32, "sha256" },
 };
 
 u16 btrfs_super_csum_size(const struct btrfs_super_block *sb)
diff --git a/ctree.h b/ctree.h
index 5c3a66fb..f7f7e296 100644
--- a/ctree.h
+++ b/ctree.h
@@ -168,6 +168,7 @@ struct btrfs_free_space_ctl;
 enum btrfs_csum_type {
 	BTRFS_CSUM_TYPE_CRC32		= 0,
 	BTRFS_CSUM_TYPE_XXHASH		= 1,
+	BTRFS_CSUM_TYPE_SHA256		= 2,
 };
 
 #define BTRFS_EMPTY_DIR_SIZE 0
diff --git a/disk-io.c b/disk-io.c
index fa679133..62ec8c1a 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -148,6 +148,8 @@ int btrfs_csum_data(u16 csum_type, const u8 *data, u8 *out, size_t len)
 		return hash_crc32c(data, len, out);
 	case BTRFS_CSUM_TYPE_XXHASH:
 		return hash_xxhash(data, len, out);
+	case BTRFS_CSUM_TYPE_SHA256:
+		return hash_sha256(data, len, out);
 	default:
 		fprintf(stderr, "ERROR: unknown csum type: %d\n", csum_type);
 		ASSERT(0);
diff --git a/mkfs/main.c b/mkfs/main.c
index 1f8ee71e..607cfe3e 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -395,6 +395,8 @@ static enum btrfs_csum_type parse_csum_type(const char *s)
 	} else if (strcasecmp(s, "xxhash64") == 0 ||
 		   strcasecmp(s, "xxhash") == 0) {
 		return BTRFS_CSUM_TYPE_XXHASH;
+	} else if (strcasecmp(s, "sha256") == 0) {
+		return BTRFS_CSUM_TYPE_SHA256;
 	} else {
 		error("unknown csum type %s", s);
 		exit(1);