diff --git a/reactos/loaders/dos/makefile b/reactos/loaders/dos/makefile
index 9b41fe8e656..be1f5452466 100644
--- a/reactos/loaders/dos/makefile
+++ b/reactos/loaders/dos/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.9 2003/11/24 16:44:10 ekohl Exp $
+# $Id: makefile,v 1.10 2004/06/02 18:24:08 hyperion Exp $
 
 PATH_TO_TOP = ../..
 
@@ -7,7 +7,7 @@ include $(PATH_TO_TOP)/rules.mak
 all: loadros.com
 
 loadros.com: loadros.asm
-	$(NASM_CMD) -fbin -o loadros.com loadros.asm
+	$(NASM) -fbin -o loadros.com loadros.asm
 
 clean:
 	- $(RM) loadros.com
diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index 26cab813555..518d20ff68e 100644
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.121 2004/05/31 23:37:22 gdalsnes Exp $
+# $Id: Makefile,v 1.122 2004/06/02 18:24:09 hyperion Exp $
 #
 # ReactOS Operating System
 #
@@ -744,7 +744,7 @@ ke/main.o: ke/main.c $(PATH_TO_TOP)/include/reactos/buildno.h
 %.o: %.s
 	$(AS) $(ASFLAGS) -c $< -o $@
 %.o: %.asm
-	$(NASM_CMD) $(NFLAGS) $< -o $@
+	$(NASM) $(NFLAGS) $< -o $@
 %.coff: %.rc
 	$(RC) $(RCFLAGS) $< -o $@
 
diff --git a/reactos/rules.mak b/reactos/rules.mak
index f8e6dedb250..d9489cebf77 100644
--- a/reactos/rules.mak
+++ b/reactos/rules.mak
@@ -28,7 +28,7 @@ PREFIX = mingw32-
 EXE_POSTFIX :=
 EXE_PREFIX := ./
 DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
-NASM_CMD = nasm
+NASM = nasm
 DOSCLI =
 FLOPPY_DIR = /mnt/floppy
 SEP := /
@@ -41,7 +41,7 @@ PREFIX =
 EXE_PREFIX :=
 EXE_POSTFIX := .exe
 DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
-NASM_CMD = nasmw
+NASM = nasmw
 DOSCLI = yes
 FLOPPY_DIR = A:
 SEP := \$(EMPTY_VAR)
@@ -103,6 +103,7 @@ STD_CFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -pipe -march=i386
 STD_CPPFLAGS = $(STD_CFLAGS)
 STD_ASFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -D__ASM__ -D_M_IX86
 STD_RCFLAGS = --include-dir $(PATH_TO_TOP)/include --include-dir $(W32API_PATH)/include
+STD_NFLAGS = -f win32
 
 # Developer Kits
 DK_PATH=$(PATH_TO_TOP)/dk
diff --git a/reactos/tools/depend.mk b/reactos/tools/depend.mk
index bb39f948d65..8f4af5d1ffc 100644
--- a/reactos/tools/depend.mk
+++ b/reactos/tools/depend.mk
@@ -35,4 +35,4 @@ endif
 	$(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
 
 .%.d: %.asm $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)
-	$(NASM_CMD) $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
+	$(NASM) $(NFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
diff --git a/reactos/tools/helper.mk b/reactos/tools/helper.mk
index 0f4f56eaf10..63ddc653dda 100644
--- a/reactos/tools/helper.mk
+++ b/reactos/tools/helper.mk
@@ -1,4 +1,4 @@
-# $Id: helper.mk,v 1.64 2004/05/29 21:24:48 hbirr Exp $
+# $Id: helper.mk,v 1.65 2004/06/02 18:24:09 hyperion Exp $
 #
 # Helper makefile for ReactOS modules
 # Variables this makefile accepts:
@@ -619,7 +619,7 @@ TARGET_RCFLAGS += $(MK_RCFLAGS) $(STD_RCFLAGS)
 
 TARGET_ASFLAGS += $(MK_ASFLAGS) $(STD_ASFLAGS)
 
-TARGET_NFLAGS += $(MK_NFLAGS)
+TARGET_NFLAGS += $(MK_NFLAGS) $(STD_NFLAGS)
 
 
 MK_GCCLIBS := $(addprefix -l, $(TARGET_GCCLIBS))
@@ -1057,7 +1057,7 @@ endif # ROS_USE_PCH
 %.o: %.s
 	$(AS) $(TARGET_ASFLAGS) -c $< -o $@
 %.o: %.asm
-	$(NASM_CMD) $(NFLAGS) $(TARGET_NFLAGS) $< -o $@
+	$(NASM) $(TARGET_NFLAGS) $< -o $@
 %.coff: %.rc
 	$(RC) $(TARGET_RCFLAGS) $< -o $@
 %.spec.def: %.spec
@@ -1071,5 +1071,6 @@ endif # ROS_USE_PCH
 
 # Compatibility
 CFLAGS := $(TARGET_CFLAGS)
+NFLAGS := $(TARGET_NFLAGS)
 
 # EOF