diff --git a/.github/workflows/macos-p7zip-CI.yml b/.github/workflows/macos-p7zip-CI.yml
index c26664e60..43e8b7ea8 100644
--- a/.github/workflows/macos-p7zip-CI.yml
+++ b/.github/workflows/macos-p7zip-CI.yml
@@ -25,18 +25,3 @@ jobs:
         git clone  https://github.com/jinfeihan57/p7zip_test_utils.git
         cd p7zip_test_utils/check
         bash check_7za.sh $PROJECT_ROOT/macos-p7zip/bin/7za
-    - name: build 7zz & check
-      run: |
-        export PROJECT_ROOT=`pwd`
-        cd CPP/7zip/Bundles/Alone2
-        make -f makefile.gcc
-        INSTALL_PREFIX=$PROJECT_ROOT/macos-p7zip make -f makefile.gcc install
-        git clone  https://github.com/jinfeihan57/p7zip_test_utils.git
-        cd p7zip_test_utils/check
-        bash check.sh $PROJECT_ROOT/macos-p7zip/bin/7zz
-    - name: build 7z.so
-      run: |
-        export PROJECT_ROOT=`pwd`
-        cd CPP/7zip/Bundles/Format7zF
-        make -f makefile.gcc
-        INSTALL_PREFIX=$PROJECT_ROOT/macos-p7zip make -f makefile.gcc install
diff --git a/C/fast-lzma2/Makefile b/C/fast-lzma2/Makefile
index ff8df346e..b7ba25824 100644
--- a/C/fast-lzma2/Makefile
+++ b/C/fast-lzma2/Makefile
@@ -38,8 +38,14 @@ ifeq ($(x86_64),1)
 	OBJ+=lzma_dec_x86_64.o
 endif
 
+ifeq ($(shell uname),Darwin)
+SHARED_LINKER_FLAGS = -dynamiclib
+else
+SHARED_LINKER_FLAGS = -soname,$(SONAME)
+endif
+
 libfast-lzma2 : $(OBJ)
-	$(CC) -shared -pthread -Wl,-soname,$(SONAME) -o $(REAL_NAME) $(OBJ)
+	$(CC) -shared -pthread -Wl,$(SHARED_LINKER_FLAGS) -o $(REAL_NAME) $(OBJ)
 
 -include $(DEP)
 
diff --git a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak
index 42fff6c8e..a55260587 100644
--- a/CPP/7zip/7zip_gcc.mak
+++ b/CPP/7zip/7zip_gcc.mak
@@ -115,8 +115,10 @@ CD = cd
 
 ifeq ($(shell uname),Darwin)
 CP = cp -rf
+SET_RPATH = install_name_tool -add_rpath
 else
 CP = cp -drf
+SET_RPATH = patchelf --force-rpath --set-rpath
 endif
 MAKE = make
 # CFLAGS_BASE := $(CFLAGS_BASE) -D_7ZIP_ST
@@ -1367,8 +1369,8 @@ $O/libbrotlicommon.$(DYSUFFIX) $O/libbrotlienc.$(DYSUFFIX) $O/libbrotlidec.$(DYS
 	$(CP) brotli_build/libbrotlicommon.$(DYSUFFIX)* $O/$(7z_LIB)/$(7Z_ADDON_CODEC)
 	$(CP) brotli_build/libbrotlidec.$(DYSUFFIX)* $O/$(7z_LIB)/$(7Z_ADDON_CODEC)
 	$(CP) brotli_build/libbrotlienc.$(DYSUFFIX)* $O/$(7z_LIB)/$(7Z_ADDON_CODEC)
-	patchelf --force-rpath --set-rpath '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/libbrotlidec.$(DYSUFFIX)*
-	patchelf --force-rpath --set-rpath '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/libbrotlienc.$(DYSUFFIX)*
+	$(SET_RPATH) '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/libbrotlidec.$(DYSUFFIX)*
+	$(SET_RPATH) '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/libbrotlienc.$(DYSUFFIX)*
 
 # Compile brotli method and Handler 
 $O/BrotliDecoder.o: ../../Compress/BrotliDecoder.cpp
@@ -1419,7 +1421,7 @@ $O/liblzhamdll.$(DYSUFFIX) $O/liblzhamcomp.$(DYSUFFIX) $O/liblzhamdecomp.$(DYSUF
 	$(CP) lzham_build/lzhamcomp/liblzhamcomp.$(DYSUFFIX)* $O/$(7z_LIB)/$(7Z_ADDON_CODEC)
 	$(CP) lzham_build/lzhamdecomp/liblzhamdecomp.$(DYSUFFIX)* $O/$(7z_LIB)/$(7Z_ADDON_CODEC)
 	$(CP) lzham_build/lzhamdll/liblzhamdll.$(DYSUFFIX)* $O/$(7z_LIB)/$(7Z_ADDON_CODEC)
-	patchelf --force-rpath --set-rpath '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/liblzhamdll.$(DYSUFFIX)*
+	$(SET_RPATH) '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/liblzhamdll.$(DYSUFFIX)*
 
 # Compile lzham register
 $O/LzhamRegister.o: ../../Compress/LzhamRegister.cpp
diff --git a/SECURITY.md b/SECURITY.md
index 12c3c9e52..3ee56340f 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -12,8 +12,4 @@ currently being supported with security updates.
 
 ## Reporting a Vulnerability
 
-Use this section to tell people how to report a vulnerability.
-
-Tell them where to go, how often they can expect to get an update on a
-reported vulnerability, what to expect if the vulnerability is accepted or
-declined, etc.
+https://github.com/p7zip-project/p7zip/security/advisories