diff --git a/Android.mk b/Android.mk
index dc557f4..1a4b9c0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -361,7 +361,6 @@
     teamwin \
     toolbox_symlinks \
     twrp \
-    unpigz_symlink \
     fsck.fat \
     fatlabel \
     mkfs.fat \
diff --git a/gui/Android.mk b/gui/Android.mk
index 3712bbf..b21c9f4 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -157,9 +157,6 @@
 	ln -sf $(TWRP_SH_TARGET) $(TARGET_RECOVERY_ROOT_OUT)/sbin/sh
 endif
 endif
-	ln -sf /sbin/pigz $(TARGET_RECOVERY_ROOT_OUT)/sbin/gzip
-	ln -sf /sbin/unpigz $(TARGET_RECOVERY_ROOT_OUT)/sbin/gunzip
-
 
 LOCAL_GENERATED_SOURCES := $(TWRP_RES_GEN)
 LOCAL_SRC_FILES := twrp $(TWRP_RES_GEN)
diff --git a/pigz/Android.mk b/pigz/Android.mk
index 9fff2f9..89f9635 100644
--- a/pigz/Android.mk
+++ b/pigz/Android.mk
@@ -12,29 +12,10 @@
 					external/zlib
 LOCAL_SHARED_LIBRARIES += libz libc
 
+LOCAL_POST_INSTALL_CMD := \
+    $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin && \
+    ln -sf pigz $(TARGET_RECOVERY_ROOT_OUT)/sbin/gunzip && \
+    ln -sf pigz $(TARGET_RECOVERY_ROOT_OUT)/sbin/gzip && \
+    ln -sf pigz $(TARGET_RECOVERY_ROOT_OUT)/sbin/unpigz
+
 include $(BUILD_EXECUTABLE)
-
-PIGZ_TOOLS := unpigz
-SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(PIGZ_TOOLS))
-$(SYMLINKS): PIGZ_BINARY := $(LOCAL_MODULE)
-$(SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@echo "Symlink: $@ -> $(PIGZ_BINARY)"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) ln -sf $(PIGZ_BINARY) $@
-
-ifneq (,$(filter $(PLATFORM_SDK_VERSION),16 17 18))
-ALL_DEFAULT_INSTALLED_MODULES += $(SYMLINKS)
-
-# We need this so that the installed files could be picked up based on the
-# local module name
-ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \
-	$(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(SYMLINKS)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := unpigz_symlink
-LOCAL_MODULE_TAGS := optional
-LOCAL_ADDITIONAL_DEPENDENCIES := $(SYMLINKS)
-include $(BUILD_PHONY_PACKAGE)
-SYMLINKS :=