diff --git a/.gitmodules b/.gitmodules
index f1521c8..2df6164 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,9 @@
 [submodule "module/jni/libcxx"]
 	path = module/jni/libcxx
 	url = https://github.com/topjohnwu/libcxx.git
-[submodule "module/jni/system_properties"]
-	path = module/jni/system_properties
-	url = https://github.com/topjohnwu/system_properties
 [submodule "module/jni/aosp_fd_utils"]
 	path = module/jni/aosp_fd_utils
 	url = https://github.com/snake-4/aosp_fd_utils.git
+[submodule "module/jni/aosp_system_properties"]
+	path = module/jni/aosp_system_properties
+	url = https://github.com/snake-4/aosp_system_properties
diff --git a/module/jni/Android.mk b/module/jni/Android.mk
index c1e7cb1..2ac8b84 100644
--- a/module/jni/Android.mk
+++ b/module/jni/Android.mk
@@ -9,5 +9,5 @@ LOCAL_LDLIBS := -llog
 include $(BUILD_SHARED_LIBRARY)
 
 include jni/libcxx/Android.mk
-include jni/system_properties/Android.mk
+include jni/aosp_system_properties/Android.mk
 include jni/aosp_fd_utils/Android.mk
diff --git a/module/jni/aosp_system_properties b/module/jni/aosp_system_properties
new file mode 160000
index 0000000..8593306
--- /dev/null
+++ b/module/jni/aosp_system_properties
@@ -0,0 +1 @@
+Subproject commit 85933060d5338112119eabf0b845d6c6e046fe3e
diff --git a/module/jni/system_properties b/module/jni/system_properties
deleted file mode 160000
index e1a3e77..0000000
--- a/module/jni/system_properties
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e1a3e77d2376be2ba747baa7ba16b34554b14956