diff --git a/reactos/apps/dist/notepad/.cvsignore b/reactos/apps/dist/notepad/.cvsignore
new file mode 100644
index 00000000000..d63774a7353
--- /dev/null
+++ b/reactos/apps/dist/notepad/.cvsignore
@@ -0,0 +1,6 @@
+*.o
+*.d
+*.exe
+*.coff
+*.sym
+*.map
diff --git a/reactos/apps/dist/notepad/makefile b/reactos/apps/dist/notepad/makefile
index 13ef3c07790..115549c501b 100644
--- a/reactos/apps/dist/notepad/makefile
+++ b/reactos/apps/dist/notepad/makefile
@@ -1,8 +1,23 @@
-all:
-	gcc -c notepad.c -o notepad.o
-	windres -i notepad.rc -o res.o
-	gcc notepad.o res.o -o notepad.nostrip.exe -mwindows
-	strip notepad.nostrip.exe -o notepad.exe
-clean:
-	del *.o
-	del *.exe
\ No newline at end of file
+# $Id: makefile,v 1.3 2003/12/30 14:28:48 weiden Exp $
+
+PATH_TO_TOP = ../../..
+
+TARGET_NORC = no
+
+TARGET_TYPE = program
+
+TARGET_APPTYPE = windows
+
+TARGET_NAME = notepad
+
+TARGET_SDKLIBS = user32.a
+
+TARGET_OBJECTS = $(TARGET_NAME).o
+
+TARGET_CFLAGS = -Wall -Werror
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+# EOF