diff --git a/debian/lightzone-Debian_12.dsc b/debian/lightzone-Debian_12.dsc
index f7e154c0..70be7e32 100644
--- a/debian/lightzone-Debian_12.dsc
+++ b/debian/lightzone-Debian_12.dsc
@@ -37,4 +37,4 @@ Package-List:
  lightzone deb graphics optional
 DEBTRANSFORM-RELEASE: 1
 DEBTRANSFORM-TAR: lightzone-5.0.0.beta2.tar.xz
-DEBTRANSFORM-SERIES: debian.series-Debian_12
+DEBTRANSFORM-SERIES: patches-Debian_12.series
diff --git a/debian/patches/font-awesome.patch b/debian/patches-Debian_12/font-awesome.patch
similarity index 59%
rename from debian/patches/font-awesome.patch
rename to debian/patches-Debian_12/font-awesome.patch
index 736fd00b..8d7b4174 100644
--- a/debian/patches/font-awesome.patch
+++ b/debian/patches-Debian_12/font-awesome.patch
@@ -1,10 +1,10 @@
-Index: LightZone/lightcrafts/src/com/lightcrafts/ui/toolkit/IconFontFactory.java
+Index: LightZone/lightcrafts/src/main/java/com/lightcrafts/ui/toolkit/IconFontFactory.java
 ===================================================================
---- LightZone.orig/lightcrafts/src/com/lightcrafts/ui/toolkit/IconFontFactory.java
-+++ LightZone/lightcrafts/src/com/lightcrafts/ui/toolkit/IconFontFactory.java
+--- LightZone.orig/lightcrafts/src/main/java/com/lightcrafts/ui/toolkit/IconFontFactory.java
++++ LightZone/lightcrafts/src/main/java/com/lightcrafts/ui/toolkit/IconFontFactory.java
 @@ -5,7 +5,7 @@
  package com.lightcrafts.ui.toolkit;
- 
+
  import jiconfont.IconCode;
 -import jiconfont.icons.FontAwesome;
 +import jiconfont.icons.font_awesome.FontAwesome;
diff --git a/debian/patches/series-Debian_12 b/debian/patches-Debian_12/series
similarity index 100%
rename from debian/patches/series-Debian_12
rename to debian/patches-Debian_12/series
diff --git a/debian/rules b/debian/rules
index 868ce69e..aea8b5dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,15 @@
 #!/usr/bin/make -f
 
+# Patch for JIconFont-FontAwesome 4.7.0.1
+JICONFONT_FONT_AWESOME_VERSION=$(shell dpkg -s libjiconfont-font-awesome-java | grep -oP "(?<=^Version: ).+")
+JICONFONT_FONT_AWESOME_4_7_0_1=$(shell if $(dpkg --compare-versions $(JICONFONT_FONT_AWESOME_VERSION) ge 4.7.0.1); then echo yes; fi)
+ifeq ($(JICONFONT_FONT_AWESOME_4_7_0_1),yes)
+export QUILT_PATCH_DIR:=debian/patches-Debian_12
+endif
+
 export JAVA_HOME=$(shell readlink -f /usr/bin/javac | sed "s:/bin/javac::")
 
-ANT_OPTIONS=-f $(CURDIR)/linux/build.xml -Dno-ivy=true -Dno-submodule=false
+ANT_OPTIONS=-f $(CURDIR)/linux/build.xml -Dno-ivy=true -Dno-submodule=true
 
 %:
 	dh $@ --with javahelper --buildsystem=ant