diff --git a/net-wireless/qflipper/files/unbundle.patch b/net-wireless/qflipper/files/qflipper-1.1.2_unbundle.patch
similarity index 100%
rename from net-wireless/qflipper/files/unbundle.patch
rename to net-wireless/qflipper/files/qflipper-1.1.2_unbundle.patch
diff --git a/net-wireless/qflipper/qflipper-1.1.2.ebuild b/net-wireless/qflipper/qflipper-1.1.2.ebuild
index da5db42a2..ef2c90d98 100644
--- a/net-wireless/qflipper/qflipper-1.1.2.ebuild
+++ b/net-wireless/qflipper/qflipper-1.1.2.ebuild
@@ -6,11 +6,13 @@ EAPI=8
 inherit qmake-utils
 
 DESCRIPTION="Desktop application for updating Flipper Zero firmware via PC"
-HOMEPAGE="https://update.flipperzero.one/ https://github.com/flipperdevices/qFlipper"
+HOMEPAGE="
+	https://update.flipperzero.one/
+"
 
 LICENSE="GPL-3+"
 SLOT="0"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flipperdevices/qFlipper.git"
 else
@@ -37,7 +39,7 @@ DEPEND="${RDEPEND}"
 BDEPEND=""
 
 PATCHES=(
-	"${FILESDIR}/unbundle.patch"
+	"${FILESDIR}/${P}_unbundle.patch"
 	"${FILESDIR}/${P}_display_version.patch"
 )
 
diff --git a/net-wireless/qflipper/qflipper-1.1.3.ebuild b/net-wireless/qflipper/qflipper-1.1.3.ebuild
index da5db42a2..60c3b4587 100644
--- a/net-wireless/qflipper/qflipper-1.1.3.ebuild
+++ b/net-wireless/qflipper/qflipper-1.1.3.ebuild
@@ -6,11 +6,13 @@ EAPI=8
 inherit qmake-utils
 
 DESCRIPTION="Desktop application for updating Flipper Zero firmware via PC"
-HOMEPAGE="https://update.flipperzero.one/ https://github.com/flipperdevices/qFlipper"
+HOMEPAGE="
+	https://update.flipperzero.one/
+"
 
 LICENSE="GPL-3+"
 SLOT="0"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flipperdevices/qFlipper.git"
 else
@@ -37,7 +39,7 @@ DEPEND="${RDEPEND}"
 BDEPEND=""
 
 PATCHES=(
-	"${FILESDIR}/unbundle.patch"
+	"${FILESDIR}/${PN}-1.1.2_unbundle.patch"
 	"${FILESDIR}/${P}_display_version.patch"
 )