diff --git a/media-gfx/slic3r/files/build-with-system-libs-1.3.0.patch b/media-gfx/slic3r/files/build-with-system-libs-1.3.0.patch
index 0cfea835ad..f14bef288d 100644
--- a/media-gfx/slic3r/files/build-with-system-libs-1.3.0.patch
+++ b/media-gfx/slic3r/files/build-with-system-libs-1.3.0.patch
@@ -30,7 +30,7 @@ Subject: [PATCH] use system's libexpat instead of vendored expat code
 ---
 --- a/Build.PL
 +++ b/Build.PL
-@@ -151,6 +151,15 @@ if (! $mswin) {
+@@ -151,6 +151,20 @@ if (! $mswin) {
          );
  }
 
@@ -41,6 +41,11 @@ Subject: [PATCH] use system's libexpat instead of vendored expat code
 +Could not find expat. Plase install.
 +EOF
 +    push @LIBS, "-lexpat";
++
++    die <<'EOF' unless check_lib(lib => "miniz");
++Could not find libexpat. Plase install.
++EOF
++    push @LIBS, "-lminiz";
 +}
 +
  if (!$ENV{SLIC3R_STATIC} && $have_boost) {
diff --git a/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild b/media-gfx/slic3r/slic3r-1.3.0.ebuild
similarity index 92%
rename from media-gfx/slic3r/slic3r-1.3.0-r2.ebuild
rename to media-gfx/slic3r/slic3r-1.3.0.ebuild
index 12df77567f..536b6f87f0 100644
--- a/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.0.ebuild
@@ -83,20 +83,22 @@ PATCHES=(
 
 src_prepare() {
 	default
-	local vendored=( admesh expat exprtk )
+	local vendored=( admesh expat exprtk miniz )
 	for v in "${vendored[@]}"; do
 		rm -rf src/"${v}" || die "Failed to remove vendored ${v}."
 	done
 
 	if [[ "${PV}" != *9999* ]]; then
+		sed -i "/^src\/admesh/d" MANIFEST || die
+		find src/libslic3r/Zip -type f \( -name ZipArchive.hpp -o -name ZipArchive.cpp \) \
+			-exec sed -i "s|\"../../miniz/miniz.h\"|<miniz/miniz.h>|" "{}" \; || die
+
 		cd .. || die
 		eapply "${FILESDIR}/cmake-with-system-libs.patch"
-		sed -i "/^src\/admesh/d" xs/MANIFEST || die
 	else
 		sed -i "/^set(EXPAT_INCLUDES$/,/^)$/c\find_package(expat REQUIRED)\n" \
 			../src/CMakeLists.txt || die
 
-		rm -rf src/miniz || die "Failed to remove vendored miniz"
 		sed -i "s|\"miniz/miniz.h\"|<miniz/miniz.h>|" src/Zip/ZipArchive.hpp || die
 		sed -i "/^add_library(miniz STATIC$/,/^)$/c\find_package(miniz REQUIRED)\n" \
 			../src/CMakeLists.txt || die
diff --git a/media-gfx/slic3r/slic3r-9999-r2.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
similarity index 92%
rename from media-gfx/slic3r/slic3r-9999-r2.ebuild
rename to media-gfx/slic3r/slic3r-9999.ebuild
index 12df77567f..536b6f87f0 100644
--- a/media-gfx/slic3r/slic3r-9999-r2.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -83,20 +83,22 @@ PATCHES=(
 
 src_prepare() {
 	default
-	local vendored=( admesh expat exprtk )
+	local vendored=( admesh expat exprtk miniz )
 	for v in "${vendored[@]}"; do
 		rm -rf src/"${v}" || die "Failed to remove vendored ${v}."
 	done
 
 	if [[ "${PV}" != *9999* ]]; then
+		sed -i "/^src\/admesh/d" MANIFEST || die
+		find src/libslic3r/Zip -type f \( -name ZipArchive.hpp -o -name ZipArchive.cpp \) \
+			-exec sed -i "s|\"../../miniz/miniz.h\"|<miniz/miniz.h>|" "{}" \; || die
+
 		cd .. || die
 		eapply "${FILESDIR}/cmake-with-system-libs.patch"
-		sed -i "/^src\/admesh/d" xs/MANIFEST || die
 	else
 		sed -i "/^set(EXPAT_INCLUDES$/,/^)$/c\find_package(expat REQUIRED)\n" \
 			../src/CMakeLists.txt || die
 
-		rm -rf src/miniz || die "Failed to remove vendored miniz"
 		sed -i "s|\"miniz/miniz.h\"|<miniz/miniz.h>|" src/Zip/ZipArchive.hpp || die
 		sed -i "/^add_library(miniz STATIC$/,/^)$/c\find_package(miniz REQUIRED)\n" \
 			../src/CMakeLists.txt || die