diff --git a/Makefile b/Makefile
index 80bfaa8..3723efc 100755
--- a/Makefile
+++ b/Makefile
@@ -2,19 +2,19 @@ iso := 'disk.img'
 
 include := './include'
 
-mbr_source_files := $(wildcard src/mbr/*.s)
-vbr_source_files := $(wildcard src/vbr/*.s)
-stage2_source_files := $(wildcard src/stage2/*.s)
-boottest_source_files := $(wildcard src/miniboot32/*.s)
+mbr_source_files := $(wildcard src/mbr/*.nasm)
+vbr_source_files := $(wildcard src/vbr/*.nasm)
+stage2_source_files := $(wildcard src/stage2/*.nasm)
+boottest_source_files := $(wildcard src/miniboot32/*.nasm)
 
-mbr_binary_files := $(patsubst src/mbr/%.s, build/%.bin, $(mbr_source_files))
-vbr_binary_files := $(patsubst src/vbr/%.s, build/%.bin, $(vbr_source_files))
-stage2_binary_files := $(patsubst src/stage2/%.s, build/%.bin, $(stage2_source_files))
-boottest_binary_files := $(patsubst src/miniboot32/%.s, build/%.bin, $(boottest_source_files))
+mbr_binary_files := $(patsubst src/mbr/%.nasm, build/%.bin, $(mbr_source_files))
+vbr_binary_files := $(patsubst src/vbr/%.nasm, build/%.bin, $(vbr_source_files))
+stage2_binary_files := $(patsubst src/stage2/%.nasm, build/%.bin, $(stage2_source_files))
+boottest_binary_files := $(patsubst src/miniboot32/%.nasm, build/%.bin, $(boottest_source_files))
 
 build_dir := 'build'
 
-qemu_args := -L ./bin/ -bios bios.bin -cpu pentium3 -m 64 -S -s -monitor stdio -nic none
+qemu_args := -L ./bin/ -bios bios.bin -cpu pentium3 -m 128 -S -s -monitor stdio -nic none
 .PHONY: all mbr vbr stage2 boottest clean run run_bochs iso
 
 all: $(iso) $(mbr_binary_files) $(vbr_binary_files) $(stage2_binary_files)
@@ -36,19 +36,19 @@ run_bochs: $(iso)
 iso: $(iso)
 	@file disk.img
 
-build/%.bin: src/mbr/%.s
+build/%.bin: src/mbr/%.nasm
 	@mkdir -p $(shell dirname $@)
 	@nasm -i$(include) -Wall -f bin $< -o $@
 
-build/%.bin: src/vbr/%.s
+build/%.bin: src/vbr/%.nasm
 	@mkdir -p $(shell dirname $@)
 	@nasm -i$(include) -Wall -f bin $< -o $@
 
-build/%.bin: src/stage2/%.s
+build/%.bin: src/stage2/%.nasm
 	@mkdir -p $(shell dirname $@)
 	@nasm -i$(include) -Wall -f bin $< -o $@
 
-build/%.bin: src/miniboot32/%.s
+build/%.bin: src/miniboot32/%.nasm
 	@mkdir -p $(shell dirname $@)
 	@nasm -i$(include) -Wall -f bin $< -o $@
 
diff --git a/src/mbr/mbr.s b/src/mbr/mbr.nasm
similarity index 100%
rename from src/mbr/mbr.s
rename to src/mbr/mbr.nasm
diff --git a/src/miniboot32/BOOT_386.s b/src/miniboot32/BOOT_386.nasm
similarity index 100%
rename from src/miniboot32/BOOT_386.s
rename to src/miniboot32/BOOT_386.nasm
diff --git a/src/stage2/stage2.s b/src/stage2/stage2.nasm
similarity index 100%
rename from src/stage2/stage2.s
rename to src/stage2/stage2.nasm
diff --git a/src/vbr/vbr.s b/src/vbr/vbr.nasm
similarity index 100%
rename from src/vbr/vbr.s
rename to src/vbr/vbr.nasm