diff --git a/core/magisk_module/lspd b/core/magisk_module/lspd
index a9fe06b7..7d423516 100644
--- a/core/magisk_module/lspd
+++ b/core/magisk_module/lspd
@@ -6,15 +6,15 @@ debug="false"
 
 if [ -r $tmpLspdDex ]; then
   java_options="-Djava.class.path=$tmpLspdDex"
-  java_options="$java_options -Djava.library.path=/data/local/tmp"
+  java_options="$java_options -Dlsp.library.path=/data/local/tmp"
   debug="true"
 elif [ -d "$dir/system" ]; then
   java_options="-Djava.class.path=$dir/system/framework/lspd.dex"
-  java_options="$java_options -Djava.library.path=$dir"
+  java_options="$java_options -Dlsp.library.path=$dir"
   debug="true"
 else
   java_options="-Djava.class.path=$dir/framework/lspd.dex"
-  java_options="$java_options -Djava.library.path=$dir"
+  java_options="$java_options -Dlsp.library.path=$dir"
 fi
 
 if [ $debug = "true" ]; then
diff --git a/core/src/main/java/org/lsposed/lspd/service/LogcatService.java b/core/src/main/java/org/lsposed/lspd/service/LogcatService.java
index 28d2697d..09e474f8 100644
--- a/core/src/main/java/org/lsposed/lspd/service/LogcatService.java
+++ b/core/src/main/java/org/lsposed/lspd/service/LogcatService.java
@@ -1,5 +1,6 @@
 package org.lsposed.lspd.service;
 
+import android.annotation.SuppressLint;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
@@ -19,8 +20,10 @@ public class LogcatService implements Runnable {
     private File log = null;
     private Thread thread = null;
 
+    @SuppressLint("UnsafeDynamicallyLoadedCode")
     public LogcatService(File logPath) {
-        System.loadLibrary("daemon");
+        String libraryPath = System.getProperty("lsp.library.path");
+        System.load(libraryPath + "/" + System.mapLibraryName("daemon"));
         this.logPath = logPath;
         logTimeFormat = DateTimeFormatter.ISO_LOCAL_DATE_TIME.withZone(Utils.getZoneId());
     }