diff --git a/patches/system/core/0001-Revert-logd-add-passcred-for-logdw-socket.patch b/patches/system/core/0001-Revert-logd-add-passcred-for-logdw-socket.patch
index 201062e..8bae5d0 100644
--- a/patches/system/core/0001-Revert-logd-add-passcred-for-logdw-socket.patch
+++ b/patches/system/core/0001-Revert-logd-add-passcred-for-logdw-socket.patch
@@ -1,4 +1,4 @@
-From d890a7f2637fac542648a2730055b2ff62a6f229 Mon Sep 17 00:00:00 2001
+From 633df09b9c0150e82e2ffdbcbd77c9dfed99a605 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 10 Dec 2017 00:26:21 +0100
 Subject: [PATCH 1/3] Revert "logd: add "+passcred" for logdw socket"
@@ -12,7 +12,7 @@
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/logd/LogListener.cpp b/logd/LogListener.cpp
-index fc51dcf..f7f8e17 100755
+index fc51dcf08d..f7f8e17924 100755
 --- a/logd/LogListener.cpp
 +++ b/logd/LogListener.cpp
 @@ -149,14 +149,14 @@ int LogListener::getLogSocket() {
@@ -36,7 +36,7 @@
      return sock;
  }
 diff --git a/logd/logd.rc b/logd/logd.rc
-index bd303b7..4fd845f 100644
+index bd303b72ba..4fd845f002 100644
 --- a/logd/logd.rc
 +++ b/logd/logd.rc
 @@ -1,7 +1,7 @@
@@ -49,5 +49,5 @@
      file /dev/kmsg w
      user logd
 -- 
-2.7.4
+2.17.1
 
diff --git a/patches/system/core/0002-Some-kernel-crashes-when-using-too-recent-sdcardfs-o.patch b/patches/system/core/0002-Some-kernel-crashes-when-using-too-recent-sdcardfs-o.patch
index aa2853f..10471bd 100644
--- a/patches/system/core/0002-Some-kernel-crashes-when-using-too-recent-sdcardfs-o.patch
+++ b/patches/system/core/0002-Some-kernel-crashes-when-using-too-recent-sdcardfs-o.patch
@@ -1,4 +1,4 @@
-From 9c66325267a68279c84f449120dbf42179cfa976 Mon Sep 17 00:00:00 2001
+From 164b7dcc67770829a65b4de26f6662a87a4636f4 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 14 Aug 2018 19:33:03 +0200
 Subject: [PATCH 2/3] Some kernel crashes when using too recent sdcardfs
@@ -10,7 +10,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/sdcard/sdcard.cpp b/sdcard/sdcard.cpp
-index dc36596..e7121a8 100644
+index f8f1cbb455..15b66acf7b 100644
 --- a/sdcard/sdcard.cpp
 +++ b/sdcard/sdcard.cpp
 @@ -102,7 +102,7 @@ static bool sdcardfs_setup(const std::string& source_path, const std::string& de
@@ -23,5 +23,5 @@
          if (multi_user && i < 3) new_opts += "multiuser,";
          if (derive_gid && i < 2) new_opts += "derive_gid,";
 -- 
-2.7.4
+2.17.1
 
diff --git a/patches/system/core/0003-First-drop_privs-which-may-fail-and-only-run-thread-.patch b/patches/system/core/0003-First-drop_privs-which-may-fail-and-only-run-thread-.patch
index f18bedd..9baf4a6 100644
--- a/patches/system/core/0003-First-drop_privs-which-may-fail-and-only-run-thread-.patch
+++ b/patches/system/core/0003-First-drop_privs-which-may-fail-and-only-run-thread-.patch
@@ -1,4 +1,4 @@
-From fd77bf67bb9ce8081e6f6167569933c4d3eb5a99 Mon Sep 17 00:00:00 2001
+From 961a623a6e46bd3aa304453324dd5cbaa2b2c951 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 14 Aug 2018 19:33:23 +0200
 Subject: [PATCH 3/3] First drop_privs (which may fail) and only run thread
@@ -10,7 +10,7 @@
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/logd/main.cpp b/logd/main.cpp
-index 4af0d21..bb64fb4 100644
+index 4af0d21f1e..bb64fb46fa 100644
 --- a/logd/main.cpp
 +++ b/logd/main.cpp
 @@ -450,6 +450,12 @@ int main(int argc, char* argv[]) {
@@ -40,5 +40,5 @@
      // socket connection, and as a reader lock on a range of log
      // entries.
 -- 
-2.7.4
+2.17.1
 
diff --git a/patches/system/vold/0004-Don-t-set-reserved_disk-group-it-panics-old-inits.patch b/patches/system/vold/0001-Don-t-set-reserved_disk-group-it-panics-old-inits.patch
similarity index 71%
rename from patches/system/vold/0004-Don-t-set-reserved_disk-group-it-panics-old-inits.patch
rename to patches/system/vold/0001-Don-t-set-reserved_disk-group-it-panics-old-inits.patch
index 4c5470b..4557aaf 100644
--- a/patches/system/vold/0004-Don-t-set-reserved_disk-group-it-panics-old-inits.patch
+++ b/patches/system/vold/0001-Don-t-set-reserved_disk-group-it-panics-old-inits.patch
@@ -1,10 +1,10 @@
-From 5a60b2a5fee25755109ab9e060bf5a2aff905ca8 Mon Sep 17 00:00:00 2001
+From 3651ff3f188d41e5e0be08f7488b9bcd129f44cd Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 14 Aug 2018 20:53:12 +0200
-Subject: [PATCH 4/4] Don't set reserved_disk group, it panics old inits
+Subject: [PATCH 1/4] Don't set reserved_disk group, it panics old inits
 
+Change-Id: I9fecd1e5187048e321af181921ecd7e37ca1eae9
 Signed-off-by: Jackeagle <jackeagle102@gmail.com>
-Change-Id: Ib9318bb0af7a2f0b5dbc75b505d1d716bb4e9cc7
 ---
  vold.rc | 1 -
  1 file changed, 1 deletion(-)
diff --git a/patches/system/vold/0001-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch b/patches/system/vold/0002-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
similarity index 86%
rename from patches/system/vold/0001-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
rename to patches/system/vold/0002-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
index 289c53f..56ccb5b 100644
--- a/patches/system/vold/0001-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
+++ b/patches/system/vold/0002-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
@@ -1,7 +1,7 @@
-From 40ca9a2fc137e0c185e3aaedeababb65f1d6cd4e Mon Sep 17 00:00:00 2001
+From 2cd6ffdbaf28cd0742842a88a26a4a63cfcee3b9 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 14 Aug 2018 20:54:08 +0200
-Subject: [PATCH 1/4] Create vendor_de. This is done by /init.rc on
+Subject: [PATCH 2/4] Create vendor_de. This is done by /init.rc on
  system-as-root device
 
 ---
diff --git a/patches/system/vold/0002-Support-Samsung-s-implementation-of-exfat-called-sdf.patch b/patches/system/vold/0003-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
similarity index 92%
rename from patches/system/vold/0002-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
rename to patches/system/vold/0003-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
index d129fae..832a558 100644
--- a/patches/system/vold/0002-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
+++ b/patches/system/vold/0003-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
@@ -1,7 +1,7 @@
-From 642887ce1ff0403fce542af0aea8c3c52ba07fdb Mon Sep 17 00:00:00 2001
+From 911e22c549e196296db3f4474d84fdec6120b2a3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 20 Aug 2018 22:37:54 +0200
-Subject: [PATCH 2/4] Support Samsung's implementation of exfat, called sdfat
+Subject: [PATCH 3/4] Support Samsung's implementation of exfat, called sdfat
 
 ---
  fs/Exfat.cpp | 9 ++++++---
diff --git a/patches/system/vold/0003-Also-create-vendor_ce-same-reason-as-vendor_de.patch b/patches/system/vold/0004-Also-create-vendor_ce-same-reason-as-vendor_de.patch
similarity index 82%
rename from patches/system/vold/0003-Also-create-vendor_ce-same-reason-as-vendor_de.patch
rename to patches/system/vold/0004-Also-create-vendor_ce-same-reason-as-vendor_de.patch
index ce56b36..20aa274 100644
--- a/patches/system/vold/0003-Also-create-vendor_ce-same-reason-as-vendor_de.patch
+++ b/patches/system/vold/0004-Also-create-vendor_ce-same-reason-as-vendor_de.patch
@@ -1,9 +1,8 @@
-From d2d67f9e989a6b72df42b387ac573f55bd236d3c Mon Sep 17 00:00:00 2001
+From 8b59752bcc3b9ed2969e308673ec4469ccade60a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 20 Aug 2018 22:38:08 +0200
-Subject: [PATCH 3/4] Also create vendor_ce (same reason as vendor_de)
+Subject: [PATCH 4/4] Also create vendor_ce (same reason as vendor_de)
 
-Change-Id: Ifba45dd063cc2f4947dcb5c47be30e34b32bd758
 ---
  Ext4Crypt.cpp | 2 ++
  1 file changed, 2 insertions(+)