diff --git a/Makefile b/Makefile
index a8528b9..9473ac7 100644
--- a/Makefile
+++ b/Makefile
@@ -317,7 +317,7 @@
 CFLAGS_KERNEL += -DROS_KERNEL 
 CFLAGS_KERNEL += -include include/generated/autoconf.h -include include/common.h
 ifeq ($(CONFIG_64BIT),y)
-CFLAGS_KERNEL += -m64
+CFLAGS_KERNEL += -m64 -g
 else
 CFLAGS_KERNEL += -m32 -gstabs
 endif
diff --git a/kern/arch/x86/Makefile b/kern/arch/x86/Makefile
index f13738a..fededcd 100644
--- a/kern/arch/x86/Makefile
+++ b/kern/arch/x86/Makefile
@@ -7,7 +7,7 @@
 CFLAGS_KERNEL += -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow
 LDFLAGS_KERNEL += -z max-page-size=0x1000
 # Need to change the format to 32 bit, to trick multiboot/grub1 into loading
-ARCH_POST_LINK_CMD = $(OBJCOPY) -I elf64-x86-64 -O elf32-i386 $@
+ARCH_POST_LINK_CMD = cp $@ $@-64b; $(OBJCOPY) -I elf64-x86-64 -O elf32-i386 $@
 else
 CROSS_COMPILE := i686-ros-
 BITS := 32