diff --git a/reactos/Makefile b/reactos/Makefile
index ec35b2468fc..1f633030565 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -59,7 +59,7 @@ SYS_APPS = services shell winlogon
 
 APPS = args hello test cat bench apc shm lpc thread event file gditest \
        pteb consume dump_shared_data vmtest regtest alive mstest nptest \
-       objdir atomtest
+       objdir atomtest winhello
 
 #NET_APPS = ping roshttpd telnet
 NET_APPS = ping roshttpd
diff --git a/reactos/apps/tests/winhello/makefile b/reactos/apps/tests/winhello/makefile
index 5685d8f81ea..6005bef782a 100644
--- a/reactos/apps/tests/winhello/makefile
+++ b/reactos/apps/tests/winhello/makefile
@@ -1,35 +1,21 @@
-#
-#
-#
+# $Id: makefile,v 1.2 2001/08/23 16:13:40 chorns Exp $
+
 PATH_TO_TOP = ../..
 
-PROGS = winhello
+TARGET_NORC = yes
 
-OBJECTS = 
-LIBS= ../../lib/kernel32/kernel32.a ../../lib/gdi32/gdi32.a
-CFLAGS = -I../../include
+TARGET_TYPE = program
 
-all: $(PROGS:%=%.exe)
+TARGET_APPTYPE = windows
 
-.phony: all
+TARGET_NAME = winhello
 
-clean:
-	- $(RM) *.o *.exe *.sym
+TARGET_SDKLIBS = kernel32.a gdi32.a
 
-.phony: clean
+TARGET_OBJECTS = $(TARGET_NAME).o
 
-install: $(PROGS:%=$(FLOPPY_DIR)/apps/%.exe)
+include $(PATH_TO_TOP)/rules.mak
 
-$(PROGS:%=$(FLOPPY_DIR)/apps/%.exe): $(FLOPPY_DIR)/apps/%.exe: %.exe
-	$(CP) $*.exe $(FLOPPY_DIR)/apps/$*.exe
+include $(TOOLS_PATH)/helper.mk
 
-dist: $(PROGS:%=../../$(DIST_DIR)/apps/%.exe)
-
-$(PROGS:%=../../$(DIST_DIR)/apps/%.exe): ../../$(DIST_DIR)/apps/%.exe: %.exe
-	$(CP) $*.exe ../../$(DIST_DIR)/apps/$*.exe
-
-winhello.exe: winhello.c
-	$(CC) $(CFLAGS) winhello.c $(LIBS) -o winhello.exe
-	$(NM) --numeric-sort winhello.exe > winhello.sym
-
-include ../../rules.mak
+# EOF
diff --git a/reactos/tools/helper.mk b/reactos/tools/helper.mk
index 7f73726428e..6c060085b76 100644
--- a/reactos/tools/helper.mk
+++ b/reactos/tools/helper.mk
@@ -1,4 +1,4 @@
-# $Id: helper.mk,v 1.3 2001/08/23 15:34:00 ekohl Exp $
+# $Id: helper.mk,v 1.4 2001/08/23 16:14:47 chorns Exp $
 #
 # Helper makefile for ReactOS modules
 # Variables this makefile accepts:
@@ -236,7 +236,7 @@ endif
 
 ifeq ($(TARGET_TYPE),program)
   ifeq ($(TARGET_APPTYPE),windows)
-    MK_DEFENTRY := _WinMainCRTStartup@16
+    MK_DEFENTRY := _WinMainCRTStartup
     MK_SDKLIBS :=
     TARGET_LFLAGS += -Wl,--subsystem,windows
   endif