diff --git a/Makefile.example b/Makefile.example
index 855559cc..78c82edd 100644
--- a/Makefile.example
+++ b/Makefile.example
@@ -128,6 +128,7 @@ include/metalsvm/config.inc: include/metalsvm/config.h
 	@echo "; Before editing this, you should consider editing config.h." >> include/metalsvm/config.inc
 	@awk '/^#define MAX_CORES/{ print "%define MAX_CORES", $$3 }' include/metalsvm/config.h >> include/metalsvm/config.inc	
 	@awk '/^#define KERNEL_STACK_SIZE/{ print "%define KERNEL_STACK_SIZE", $$3 }' include/metalsvm/config.h >> include/metalsvm/config.inc
+	@awk '/^#define CONFIG_VGA/{ print "%define CONFIG_VGA", $$3 }' include/metalsvm/config.h >> include/metalsvm/config.inc
 
 %.o : %.asm include/metalsvm/config.inc
 	@echo [ASM] $@
diff --git a/Makefile.scc b/Makefile.scc
index 7e466274..ed5cc5d6 100644
--- a/Makefile.scc
+++ b/Makefile.scc
@@ -128,6 +128,7 @@ include/metalsvm/config.inc: include/metalsvm/config.h
 	@echo "; Before editing this, you should consider editing config.h." >> include/metalsvm/config.inc
 	@awk '/^#define MAX_CORES/{ print "%define MAX_CORES", $$3 }' include/metalsvm/config.h >> include/metalsvm/config.inc	
 	@awk '/^#define KERNEL_STACK_SIZE/{ print "%define KERNEL_STACK_SIZE", $$3 }' include/metalsvm/config.h >> include/metalsvm/config.inc
+	@awk '/^#define CONFIG_VGA/{ print "%define CONFIG_VGA", $$3 }' include/metalsvm/config.h >> include/metalsvm/config.inc
 
 %.o : %.asm include/metalsvm/config.inc
 	@echo [ASM] $@
diff --git a/arch/x86/kernel/entry64.asm b/arch/x86/kernel/entry64.asm
index 677eb787..3cebc86f 100644
--- a/arch/x86/kernel/entry64.asm
+++ b/arch/x86/kernel/entry64.asm
@@ -230,6 +230,7 @@ L0:
     add ebx, 0x1000
     loop L0
 
+%ifdef CONFIG_VGA
     ; map the VGA address into the virtual address space
     mov edi, 0xB8000
     shr edi, 9   ; (edi >> 12) * 8
@@ -237,6 +238,7 @@ L0:
     mov ebx, 0xB8000
     or ebx, 0x00000013
     mov DWORD [edi], ebx
+%endif
 
     ; map multiboot structure into the virtual address space
     mov edi, [esp]