diff --git a/patcher/CommonPatcher b/patcher/CommonPatcher
index 9642bbc..3258a87 100644
--- a/patcher/CommonPatcher
+++ b/patcher/CommonPatcher
@@ -334,6 +334,11 @@ detect_sdk () {
 		SMALI="${BASEDIR}/smali_23.dex"
 	fi
 
+	if [ "${SDK_VERSION}" -gt 25 ]; then
+		DEXPATCHER="${BASEDIR}/dexpatcher_26.dex"
+	else	DEXPATCHER="${BASEDIR}/dexpatcher_19.dex"
+	fi
+
 	PATCH_CORE="${BASEDIR}/core_services.jar.dex"
 
 	if [ "${SDK_VERSION}" -lt 24 ]; then
@@ -511,7 +516,7 @@ patch_services () {
 	ui_print " >> patching services.jar"
 
 	call_dalvikvm \
-		-classpath "${BASEDIR}/dexpatcher.dex" \
+		-classpath "${DEXPATCHER}" \
 		lanchon.dexpatcher.Main \
 		${DEX_OPTS} --api-level "${SDK_VERSION}" \
 		--verbose --debug --output ${BASEDIR}/services.jar-mod \
diff --git a/patcher/dexpatcher/dexpatcher.dex b/patcher/dexpatcher/dexpatcher.dex
deleted file mode 100644
index 4809a86..0000000
Binary files a/patcher/dexpatcher/dexpatcher.dex and /dev/null differ
diff --git a/patcher/dexpatcher/dexpatcher_19.dex b/patcher/dexpatcher/dexpatcher_19.dex
new file mode 100644
index 0000000..e3aed29
Binary files /dev/null and b/patcher/dexpatcher/dexpatcher_19.dex differ
diff --git a/patcher/dexpatcher/dexpatcher_26.dex b/patcher/dexpatcher/dexpatcher_26.dex
new file mode 100644
index 0000000..572f5cb
Binary files /dev/null and b/patcher/dexpatcher/dexpatcher_26.dex differ