diff --git a/cmds-receive.c b/cmds-receive.c
index 95dc3ec4..ed441076 100644
--- a/cmds-receive.c
+++ b/cmds-receive.c
@@ -78,7 +78,7 @@ static int finish_subvol(struct btrfs_receive *r)
 	int ret;
 	int subvol_fd = -1;
 	struct btrfs_ioctl_received_subvol_args rs_args;
-	char uuid_str[128];
+	char uuid_str[BTRFS_UUID_UNPARSED_SIZE];
 	u64 flags;
 
 	if (r->cur_subvol == NULL)
@@ -149,7 +149,7 @@ static int process_subvol(const char *path, const u8 *uuid, u64 ctransid,
 	int ret;
 	struct btrfs_receive *r = user;
 	struct btrfs_ioctl_vol_args args_v1;
-	char uuid_str[128];
+	char uuid_str[BTRFS_UUID_UNPARSED_SIZE];
 
 	ret = finish_subvol(r);
 	if (ret < 0)
@@ -196,7 +196,7 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid,
 {
 	int ret;
 	struct btrfs_receive *r = user;
-	char uuid_str[128];
+	char uuid_str[BTRFS_UUID_UNPARSED_SIZE];
 	struct btrfs_ioctl_vol_args_v2 args_v2;
 	struct subvol_info *parent_subvol = NULL;
 
diff --git a/print-tree.c b/print-tree.c
index 716f4d37..9b90f9b5 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -378,7 +378,7 @@ static void print_root(struct extent_buffer *leaf, int slot)
 	struct btrfs_root_item *ri;
 	struct btrfs_root_item root_item;
 	int len;
-	char uuid_str[128];
+	char uuid_str[BTRFS_UUID_UNPARSED_SIZE];
 
 	ri = btrfs_item_ptr(leaf, slot, struct btrfs_root_item);
 	len = btrfs_item_size_nr(leaf, slot);
diff --git a/send-test.c b/send-test.c
index a37b7fd6..5f7c3111 100644
--- a/send-test.c
+++ b/send-test.c
@@ -72,7 +72,7 @@ static int print_subvol(const char *path, const u8 *uuid, u64 ctransid,
 			void *user)
 {
 	struct recv_args *r = user;
-	char uuid_str[128];
+	char uuid_str[BTRFS_UUID_UNPARSED_SIZE];
 
 	r->full_subvol_path = path_cat(r->root_path, path);
 	uuid_unparse(uuid, uuid_str);
@@ -88,8 +88,8 @@ static int print_snapshot(const char *path, const u8 *uuid, u64 ctransid,
 			  void *user)
 {
 	struct recv_args *r = user;
-	char uuid_str[128];
-	char parent_uuid_str[128];
+	char uuid_str[BTRFS_UUID_UNPARSED_SIZE];
+	char parent_uuid_str[BTRFS_UUID_UNPARSED_SIZE];
 
 	r->full_subvol_path = path_cat(r->root_path, path);
 	uuid_unparse(uuid, uuid_str);