diff --git a/docker-builder-data/build/script/packet/synfigcore-debug.sh b/docker-builder-data/build/script/packet/synfigcore-debug.sh
new file mode 100644
index 0000000..c1e76c9
--- /dev/null
+++ b/docker-builder-data/build/script/packet/synfigcore-debug.sh
@@ -0,0 +1,7 @@
+source "$PACKET_SCRIPT_DIR/synfigcore-master.sh"
+
+DEPS=`echo "$DEPS" | sed "s|synfigetl-master|synfigetl-debug|g"`
+PK_URL="https://github.com/blackwarthog/$PK_DIRNAME.git"
+PK_GIT_OPTIONS="--branch debug"
+PK_CPPFLAGS="-Wa,-mbig-obj"
+PK_CONFIGURE_OPTIONS="--enable-debug --enable-optimization=0"
diff --git a/docker-builder-data/build/script/packet/synfigcore-master.sh b/docker-builder-data/build/script/packet/synfigcore-master.sh
index 7b592a9..c8d1b55 100644
--- a/docker-builder-data/build/script/packet/synfigcore-master.sh
+++ b/docker-builder-data/build/script/packet/synfigcore-master.sh
@@ -65,7 +65,7 @@ DEPS=" \
  boost-1.61.0 cairo-1.15.4 pango-1.40.3 "
 DEPS_NATIVE="libtool-2.4.6"
 
-if [ "$PLATFORM" = "win" ]; then
+if [ "$PLATFORM" = "win" ] || [ "$PLATFORM" = "fedora" ]; then
     DEPS="$DEPS glibmm-2.50.0 xmlpp-2.40.1"
 else
     DEPS="$DEPS glibmm-2.41.4 xmlpp-2.22.0"
@@ -87,13 +87,15 @@ pkbuild() {
     if ! check_packet_function $NAME build.configure; then
         libtoolize --ltdl --copy --force || return 1
         autoreconf --install --force || return 1
-        ./configure \
-            --host=$HOST \
-            --prefix=$INSTALL_PACKET_DIR \
-            --sysconfdir=$INSTALL_PACKET_DIR/etc \
-            --with-boost-libdir=$ENVDEPS_PACKET_DIR/lib \
-            --without-opengl \
-           || return 1
+        CPPFLAGS="$PK_CPPFLAGS $CPPFLAGS" \
+         ./configure \
+         --host=$HOST \
+         --prefix=$INSTALL_PACKET_DIR \
+         --sysconfdir=$INSTALL_PACKET_DIR/etc \
+         --with-boost-libdir=$ENVDEPS_PACKET_DIR/lib \
+         --without-opengl \
+         $PK_CONFIGURE_OPTIONS \
+         || return 1
         set_done $NAME build.configure
     fi
     make -j${THREADS} || return 1
diff --git a/docker-builder-data/build/script/packet/synfigetl-debug.sh b/docker-builder-data/build/script/packet/synfigetl-debug.sh
new file mode 100644
index 0000000..84bf2c0
--- /dev/null
+++ b/docker-builder-data/build/script/packet/synfigetl-debug.sh
@@ -0,0 +1,5 @@
+source "$PACKET_SCRIPT_DIR/synfigetl-master.sh"
+
+PK_URL="https://github.com/blackwarthog/$PK_DIRNAME.git"
+PK_GIT_OPTIONS="--branch debug"
+PK_CONFIGURE_OPTIONS="--enable-debug --enable-optimization=0"
diff --git a/docker-builder-data/build/script/packet/synfigetl-master.sh b/docker-builder-data/build/script/packet/synfigetl-master.sh
index 6969728..b67ac99 100644
--- a/docker-builder-data/build/script/packet/synfigetl-master.sh
+++ b/docker-builder-data/build/script/packet/synfigetl-master.sh
@@ -9,17 +9,18 @@ PK_LICENSE_FILES="ETL/AUTHORS ETL/README"
 source $INCLUDE_SCRIPT_DIR/inc-pkall-git.sh
 
 pkbuild() {
-	cd "$BUILD_PACKET_DIR/$PK_DIRNAME/ETL" || return 1
-	if ! check_packet_function $NAME build.configure; then
-		autoreconf --install --force || return 1
-		./configure \
-		 --host=$HOST \
-		 --prefix=$INSTALL_PACKET_DIR \
-		 --sysconfdir=$INSTALL_PACKET_DIR/etc \
-		 || return 1
-		set_done $NAME build.configure
-	fi
-	make -j${THREADS} || return 1
+    cd "$BUILD_PACKET_DIR/$PK_DIRNAME/ETL" || return 1
+    if ! check_packet_function $NAME build.configure; then
+        autoreconf --install --force || return 1
+        ./configure \
+         --host=$HOST \
+         --prefix=$INSTALL_PACKET_DIR \
+         --sysconfdir=$INSTALL_PACKET_DIR/etc \
+         $PK_CONFIGURE_OPTIONS \
+         || return 1
+        set_done $NAME build.configure
+    fi
+    make -j${THREADS} || return 1
 }
 
 pkinstall() {
diff --git a/docker-builder-data/build/script/packet/synfigstudio-debug.files b/docker-builder-data/build/script/packet/synfigstudio-debug.files
new file mode 120000
index 0000000..4360cbb
--- /dev/null
+++ b/docker-builder-data/build/script/packet/synfigstudio-debug.files
@@ -0,0 +1 @@
+synfigstudio-master.files
\ No newline at end of file
diff --git a/docker-builder-data/build/script/packet/synfigstudio-debug.sh b/docker-builder-data/build/script/packet/synfigstudio-debug.sh
new file mode 100644
index 0000000..c87c357
--- /dev/null
+++ b/docker-builder-data/build/script/packet/synfigstudio-debug.sh
@@ -0,0 +1,6 @@
+source "$PACKET_SCRIPT_DIR/synfigstudio-master.sh"
+
+DEPS=`echo "$DEPS" | sed "s|synfigcore-master|synfigcore-debug|g"`
+PK_URL="https://github.com/blackwarthog/$PK_DIRNAME.git"
+PK_GIT_OPTIONS="--branch debug"
+PK_CONFIGURE_OPTIONS="--enable-debug --enable-optimization=0"
diff --git a/docker-builder-data/build/script/packet/synfigstudio-master.sh b/docker-builder-data/build/script/packet/synfigstudio-master.sh
index 7c1390f..432d665 100644
--- a/docker-builder-data/build/script/packet/synfigstudio-master.sh
+++ b/docker-builder-data/build/script/packet/synfigstudio-master.sh
@@ -20,7 +20,7 @@
 DEPS="synfigcore-master"
 DEPS_NATIVE="libtool-2.4.6 synfigcore-master"
 
-if [ "$PLATFORM" = "win" ]; then
+if [ "$PLATFORM" = "win" ] || [ "$PLATFORM" = "fedora" ]; then
     DEPS="$DEPS gtkmm-3.22.0"
 else
     DEPS="$DEPS gtkmm-3.14.0"
@@ -52,7 +52,8 @@ pkbuild() {
          --host=$HOST \
          --prefix=$INSTALL_PACKET_DIR \
          --sysconfdir=$INSTALL_PACKET_DIR/etc \
-        || return 1
+         $PK_CONFIGURE_OPTIONS \
+         || return 1
         set_done $NAME build.configure
     fi
     make -j${THREADS} || return 1