Index: sbin/newfs_nandfs/newfs_nandfs.c
===================================================================
--- sbin/newfs_nandfs/newfs_nandfs.c
+++ sbin/newfs_nandfs/newfs_nandfs.c
@@ -520,6 +520,7 @@
 static void
 create_fsdata(void)
 {
+	struct uuid fs_uuid;
 
 	memset(&fsdata, 0, sizeof(struct nandfs_fsdata));
 
@@ -540,7 +541,8 @@
 	fsdata.f_checkpoint_size = sizeof(struct nandfs_checkpoint);
 	fsdata.f_segment_usage_size = sizeof(struct nandfs_segment_usage);
 
-	uuidgen(&fsdata.f_uuid, 1);
+	uuidgen(&fs_uuid, 1);
+	memcpy(&fsdata.f_uuid, &fs_uuid, sizeof(fsdata.f_uuid));
 
 	if (volumelabel)
 		memcpy(fsdata.f_volume_name, volumelabel, 16);