diff --git a/.gdbinit b/.gdbinit
deleted file mode 100644
index d307b08..0000000
--- a/.gdbinit
+++ /dev/null
@@ -1,2 +0,0 @@
-file kernel/bin/kernel-x86_64
-target remote :1234
\ No newline at end of file
diff --git a/Makefile b/Makefile
index e2ae18c..94e5a9c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ ARCH ?= x86_64
 
 KERNEL_HDD = kornos.img
 
-.PHONY: clean all $(COMPONENTS) run bochs
+.PHONY: clean all $(COMPONENTS) run bochs gdb
 .DEFAULT_GOAL = $(KERNEL_HDD)
 
 $(COMPONENTS):
@@ -24,6 +24,9 @@ bochs: $(KERNEL_HDD) ext/bochsrc
 	bochs -qf ext/bochsrc
 	rm bochsout.txt
 
+gdb:
+	QEMUFLAGS="-s -S" $(MAKE) run & gdb -x ext/gdbinit
+
 ext/limine/limine-install:
 	$(MAKE) -C ext/limine/ limine-install
 ext/echfs/echfs-utils:
diff --git a/ext/gdbinit b/ext/gdbinit
new file mode 100644
index 0000000..19523e7
--- /dev/null
+++ b/ext/gdbinit
@@ -0,0 +1,5 @@
+file kernel/bin/kernel-x86_64
+target remote :1234
+hbreak stivale2_main
+hbreak halt_catch_fire
+continue
\ No newline at end of file