diff --git a/build.gradle b/build.gradle
index 12c35b6ec..6ca2511e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools:r8:1.4.96'
-        classpath 'com.android.tools.build:gradle:3.5.0-beta01'
+        classpath 'com.android.tools.build:gradle:3.5.0-beta02'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.31"
 
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7fe046fef..e0c5b50a3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Apr 26 14:06:46 CEST 2019
+#Thu May 23 01:06:46 PDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/native/jni/magiskboot/bootimg.cpp b/native/jni/magiskboot/bootimg.cpp
index f46f1b32c..07ba2e160 100644
--- a/native/jni/magiskboot/bootimg.cpp
+++ b/native/jni/magiskboot/bootimg.cpp
@@ -90,10 +90,6 @@ int boot_img::parse_file(const char *image) {
 		case AOSP:
 			return parse_image(head);
 
-		/* Unsupported */
-		case ELF32:
-		case ELF64:
-			exit(UNSUPP_RET);
 		default:
 			break;
 		}
@@ -345,7 +341,7 @@ int unpack(const char *image, bool hdr) {
 void repack(const char* orig_image, const char* out_image) {
 	boot_img boot {};
 
-	off_t header_off, kernel_off, ramdisk_off, second_off, extra_off;
+	off_t header_off, kernel_off, ramdisk_off, second_off, extra_off, dtb_off;
 
 	// Parse original image
 	boot.parse_file(orig_image);
@@ -475,6 +471,7 @@ void repack(const char* orig_image, const char* out_image) {
 	}
 
 	// dtb
+	dtb_off = lseek(fd, 0, SEEK_CUR);
 	if (access(DTB_FILE, R_OK) == 0) {
 		boot.hdr.dtb_size() = restore(DTB_FILE, fd);
 		file_align();
@@ -527,6 +524,11 @@ void repack(const char* orig_image, const char* out_image) {
 		size = boot.hdr.recovery_dtbo_size();
 		HASH_update(&ctx, boot.map_addr + boot.hdr.recovery_dtbo_offset(), size);
 		HASH_update(&ctx, &size, sizeof(size));
+		size = boot.hdr.dtb_size();
+		if (size) {
+			HASH_update(&ctx, boot.map_addr + dtb_off, size);
+			HASH_update(&ctx, &size, sizeof(size));
+		}
 	}
 	memset(boot.hdr.id(), 0, 32);
 	memcpy(boot.hdr.id(), HASH_final(&ctx),
diff --git a/native/jni/magiskboot/format.cpp b/native/jni/magiskboot/format.cpp
index 9c5f56a11..eda3ceaa7 100644
--- a/native/jni/magiskboot/format.cpp
+++ b/native/jni/magiskboot/format.cpp
@@ -27,10 +27,6 @@ format_t check_fmt(const void *buf, size_t len) {
 		return CHROMEOS;
 	} else if (MATCH(BOOT_MAGIC)) {
 		return AOSP;
-	} else if (MATCH(ELF32_MAGIC)) {
-		return ELF32;
-	} else if (MATCH(ELF64_MAGIC)) {
-		return ELF64;
 	} else if (MATCH(GZIP1_MAGIC) || MATCH(GZIP2_MAGIC)) {
 		return GZIP;
 	} else if (MATCH(LZOP_MAGIC)) {
diff --git a/native/jni/magiskboot/format.h b/native/jni/magiskboot/format.h
index 1d53ddb13..6ec8ab042 100644
--- a/native/jni/magiskboot/format.h
+++ b/native/jni/magiskboot/format.h
@@ -8,8 +8,6 @@ typedef enum {
 /* Boot formats */
 	CHROMEOS,
 	AOSP,
-	ELF32,
-	ELF64,
 	DHTB,
 	BLOB,
 /* Compression formats */
@@ -29,8 +27,6 @@ typedef enum {
 
 #define BOOT_MAGIC      "ANDROID!"
 #define CHROMEOS_MAGIC  "CHROMEOS"
-#define ELF32_MAGIC     "\x7f""ELF\x01"
-#define ELF64_MAGIC     "\x7f""ELF\x02"
 #define GZIP1_MAGIC     "\x1f\x8b"
 #define GZIP2_MAGIC     "\x1f\x9e"
 #define LZOP_MAGIC      "\x89""LZO"