diff --git a/aarch64/aarch64.gdb b/aarch64/aarch64.gdb
index 0ff644d..3a07317 100644
--- a/aarch64/aarch64.gdb
+++ b/aarch64/aarch64.gdb
@@ -84,10 +84,20 @@
 	       bn <sym>
 end
 
+define dump_host_s2_pgtables
+
+end
+document dump_host_s2_pgtables
+	Dump the host stage-2 pagetables from the given address.
+end
+
 file "##ELF_PATH##"
+symbol-file
+add-symbol-file "##ELF_PATH##" -o 0x80000
+
+tbreak kvm_apply_hyp_relocations
 
 # Break after memory layout constants have been computed.
-tbreak apply_alternatives_all
 commands
 	# Cache kernel constants so they are available regardless
 	# of CurrentEL.
@@ -106,13 +116,3 @@
 
 	echo Protected KVM debug mode initialized\n
 end
-
-add-symbol-file "##BL1_ELF_PATH##"
-add-symbol-file "##BL2_ELF_PATH##"
-add-symbol-file "##BL31_ELF_PATH##"
-
-# Connect to QEMU emulating the kernel.
-target remote :1234
-
-# Boot the kernel up to the breakpoint above.
-continue