:: commit ce20d1f827fdc1be9a27b98cc24f2ded6cdc55d3

diff --git a/common/common.mk b/common/common.mk
index a7a2575e..8bf8000e 100644
--- a/common/common.mk
+++ b/common/common.mk
@@ -60,7 +60,8 @@ override NASMFLAGS_FOR_TARGET += \
     -Wall \
     -w-unknown-warning \
     -w-reloc \
-    $(WERROR_FLAG)
+    $(WERROR_FLAG) \
+    -g
 
 ifeq ($(TARGET),bios)
     override CFLAGS_FOR_TARGET += \
@@ -74,7 +75,7 @@ ifeq ($(TARGET),bios)
         -DBIOS
     override NASMFLAGS_FOR_TARGET := \
         -f elf32 \
-        $(NASMFLAGS_FOR_TARGET) \
+        $(shell printf '%s' '$(NASMFLAGS_FOR_TARGET)' | $(SED) -E 's/(^|[[:space:]])-g($$|[[:space:]])/\1-g -F dwarf\2/g') \
         -DIA32_TARGET \
         -DBIOS
 endif
@@ -97,7 +98,7 @@ ifeq ($(TARGET),uefi-x86-64)
         -DUEFI
     override NASMFLAGS_FOR_TARGET := \
         -f elf64 \
-        $(NASMFLAGS_FOR_TARGET) \
+        $(shell printf '%s' '$(NASMFLAGS_FOR_TARGET)' | $(SED) -E 's/(^|[[:space:]])-g($$|[[:space:]])/\1-g -F dwarf\2/g') \
         -DX86_64_TARGET \
         -DUEFI
 endif
diff --git a/configure.ac b/configure.ac
index d2408c3e..cb88f626 100644
--- a/configure.ac
+++ b/configure.ac
@@ -379,7 +379,7 @@ AC_ARG_VAR([LDFLAGS_FOR_TARGET], [linker flags for Limine])
 test "x${LDFLAGS_FOR_TARGET+set}" = "x" && LDFLAGS_FOR_TARGET=""
 
 AC_ARG_VAR([NASMFLAGS_FOR_TARGET], [nasm flags for Limine])
-test "x${NASMFLAGS_FOR_TARGET+set}" = "x" && NASMFLAGS_FOR_TARGET="-F dwarf -g"
+test "x${NASMFLAGS_FOR_TARGET+set}" = "x" && NASMFLAGS_FOR_TARGET="-g"
 
 LIMINE_COPYRIGHT=$($GREP Copyright "$SRCDIR/COPYING")
 AC_SUBST([LIMINE_COPYRIGHT])
diff --git a/decompressor/decompressor.mk b/decompressor/decompressor.mk
index aa5ccd6c..31184336 100644
--- a/decompressor/decompressor.mk
+++ b/decompressor/decompressor.mk
@@ -47,7 +47,7 @@ override LDFLAGS_FOR_TARGET += \
 
 override NASMFLAGS_FOR_TARGET := \
     -f elf32 \
-    $(NASMFLAGS_FOR_TARGET) \
+    $(shell printf '%s' '$(NASMFLAGS_FOR_TARGET)' | $(SED) -E 's/(^|[[:space:]])-g($$|[[:space:]])/\1-g -F dwarf\2/g') \
     -Wall \
     -w-unknown-warning \
     -w-reloc \