diff --git a/rosapps/net/ncftp/makefile b/rosapps/net/ncftp/makefile
index 2c38feab154..7bc072db915 100644
--- a/rosapps/net/ncftp/makefile
+++ b/rosapps/net/ncftp/makefile
@@ -4,8 +4,6 @@
 
 PATH_TO_TOP=../../../reactos
 
-ROS_DIR=../../../reactos
-
 TARGET_TYPE = program
 
 TARGET_APPTYPE = console
diff --git a/rosapps/net/ping/makefile b/rosapps/net/ping/makefile
index a39efa3348f..88ec9215105 100644
--- a/rosapps/net/ping/makefile
+++ b/rosapps/net/ping/makefile
@@ -1,9 +1,7 @@
-# $Id: makefile,v 1.1 2001/12/30 04:09:38 sedwards Exp $
+# $Id: makefile,v 1.2 2001/12/31 18:24:13 sedwards Exp $
 
 PATH_TO_TOP=../../../reactos
 
-ROS_DIR=../../../reactos
-
 TARGET_TYPE = program
 
 TARGET_APPTYPE = console
diff --git a/rosapps/net/telnet/Makefile b/rosapps/net/telnet/Makefile
index 94f50dd6c73..35ae7154a26 100644
--- a/rosapps/net/telnet/Makefile
+++ b/rosapps/net/telnet/Makefile
@@ -1,139 +1,43 @@
-#
-# Makefile for Console Telnet
-# Last modified 4/15/2000 by Paul Brannan
-#
+# $Id: Makefile,v 1.2 2001/12/31 18:23:19 sedwards Exp $
 
-SRCDIR=./src
-OBJDIR=src
-RESDIR=resource
+PATH_TO_TOP=../../../reactos
 
-SRC=$(wildcard $(SRCDIR)/*.cpp)
-RESOURCES=$(wildcard $(RESDIR)/*.rc)
-OBJ1=$(SRC:.c=.o)
-OBJ=$(OBJ1:.cpp=.o) $(RESOURCES:.rc=.o)
+TARGET_TYPE = program
 
-INCLUDES=-I$(RESDIR)
+TARGET_APPTYPE = console
 
-OUT=telnet.exe
+TARGET_NAME = telnet
 
-# Modify these for your system if necessary
-# Note: DJGPP+RDXNTDJ configuration is untested.
+TARGET_SDKLIBS = ws2_32.a
 
-# --CYGWIN--
-#CC=gcc
-#CCC=g++
-#LDFLAGS=-lwsock32 -lmsvcrt
-#CFLAGS=-O2 -Wall -mwindows -mno-cygwin -D__CYGWIN__
-#CCFLAGS=$(CFLAGS)
-#RES=
-#RC=windres
-#RCFLAGS=-O coff
+TARGET_CPPFLAGS = -D__REACTOS__
 
-# --MINGW32(+EGCS)--
-CC=gcc
-CCC=g++
-LDFLAGS=-lkernel32 -luser32 -lgdi32 -lshell32 -lwsock32 -lstdc++
-CFLAGS=-O2 -Wall
-CCFLAGS=$(CFLAGS)
-RES=
-RC=windres
-RCFLAGS=
+TARGET_GCCLIBS = stdc++
 
-# --DJGPP+RSXNTDJ--
-#CC=gcc -Zwin32 -Zmt -Zcrtdll
-#CCC=$(CC)
-#LDFLAGS=
-#CFLAGS= -g
-#CCFLAGS=$(CFLAGS)
-#RES=rsrc
-#RC=grc
-#RCFLAGS=-r
+TARGET_OBJECTS = \
+src\ansiprsr.o \
+src\keytrans.o \
+src\tcharmap.o \
+src\tconsole.o \
+src\tkeydef.o \
+src\tkeymap.o \
+src\tmapldr.o \
+src\tmouse.o \
+src\tnclass.o \
+src\tnclip.o \
+src\tncon.o \
+src\tnconfig.o \
+src\tnerror.o \
+src\tnetwork.o \
+src\tnmain.o \
+src\tnmisc.o \
+src\tscript.o \
+src\tscroll.o \
+src\ttelhndl.o
 
 
-# You should not have to modify anything below this line
+include $(PATH_TO_TOP)/rules.mak
 
-all: $(OUT)
+include $(TOOLS_PATH)/helper.mk
 
-.SUFFIXES: .c .cpp .rc
-
-.c.o:
-	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
-
-.cpp.o:
-	$(CCC) $(INCLUDES) $(CCFLAGS) -c $< -o $@
-
-.rc.o:
-	$(RC) -i $< $(RCFLAGS) -o $@
-
-$(OUT): $(OBJ)
-	$(CCC) $(OBJ) $(LDFLAGS) $(LIBS) -o $(OUT)
-	strip $(OUT)
-
-#clean:
-#	del $(OBJDIR)\*.o
-#	del $(OUT)
-clean:
-	"../../../reactos/tools/rdel" "src/*.o"
-
-# DO NOT DELETE
-
-./src/ansiprsr.o: ./src/ansiprsr.h ./src/tnconfig.h ./src/tnerror.h
-./src/ansiprsr.o: ./src/tnmsg.h ./src/tparser.h ./src/tconsole.h
-./src/ansiprsr.o: ./src/keytrans.h ./src/tkeydef.h ./src/tkeymap.h
-./src/ansiprsr.o: ./src/stl_bids.h ./src/tscroll.h ./src/tmouse.h
-./src/ansiprsr.o: ./src/tnclip.h ./src/tnetwork.h ./src/tcharmap.h
-./src/keytrans.o: ./src/keytrans.h ./src/tkeydef.h ./src/tkeymap.h
-./src/keytrans.o: ./src/stl_bids.h ./src/tnerror.h ./src/tnmsg.h
-./src/tcharmap.o: ./src/tcharmap.h ./src/tnconfig.h ./src/tnerror.h
-./src/tcharmap.o: ./src/tnmsg.h
-./src/tconsole.o: ./src/tconsole.h ./src/tnconfig.h ./src/tnerror.h
-./src/tconsole.o: ./src/tnmsg.h
-./src/tkeydef.o: ./src/tkeydef.h
-./src/tkeymap.o: ./src/tkeymap.h ./src/stl_bids.h ./src/tkeydef.h
-./src/tmapldr.o: ./src/tmapldr.h ./src/keytrans.h ./src/tkeydef.h
-./src/tmapldr.o: ./src/tkeymap.h ./src/stl_bids.h ./src/tcharmap.h
-./src/tmapldr.o: ./src/tnerror.h ./src/tnmsg.h ./src/tnconfig.h
-./src/tmouse.o: ./src/tmouse.h ./src/tnclip.h ./src/tnetwork.h
-./src/tmouse.o: ./src/tconsole.h ./src/tnconfig.h ./src/tnerror.h
-./src/tmouse.o: ./src/tnmsg.h
-./src/tnclass.o: ./src/tnclass.h ./src/tnconfig.h ./src/tnerror.h
-./src/tnclass.o: ./src/tnmsg.h ./src/ttelhndl.h ./src/tparser.h
-./src/tnclass.o: ./src/tconsole.h ./src/keytrans.h ./src/tkeydef.h
-./src/tnclass.o: ./src/tkeymap.h ./src/stl_bids.h ./src/tscroll.h
-./src/tnclass.o: ./src/tmouse.h ./src/tnclip.h ./src/tnetwork.h
-./src/tnclass.o: ./src/tcharmap.h ./src/tncon.h ./src/tparams.h
-./src/tnclass.o: ./src/ansiprsr.h ./src/tmapldr.h ./src/tnmisc.h
-./src/tnclip.o: ./src/tnclip.h ./src/tnetwork.h
-./src/tncon.o: ./src/tncon.h ./src/tparams.h ./src/ttelhndl.h ./src/tparser.h
-./src/tncon.o: ./src/tconsole.h ./src/tnconfig.h ./src/tnerror.h
-./src/tncon.o: ./src/tnmsg.h ./src/keytrans.h ./src/tkeydef.h ./src/tkeymap.h
-./src/tncon.o: ./src/stl_bids.h ./src/tscroll.h ./src/tmouse.h ./src/tnclip.h
-./src/tncon.o: ./src/tnetwork.h ./src/tcharmap.h
-./src/tnconfig.o: ./src/tnconfig.h ./src/tnerror.h ./src/tnmsg.h
-./src/tnerror.o: ./src/tnerror.h ./src/tnmsg.h ./src/ttelhndl.h
-./src/tnerror.o: ./src/tparser.h ./src/tconsole.h ./src/tnconfig.h
-./src/tnerror.o: ./src/keytrans.h ./src/tkeydef.h ./src/tkeymap.h
-./src/tnerror.o: ./src/stl_bids.h ./src/tscroll.h ./src/tmouse.h
-./src/tnerror.o: ./src/tnclip.h ./src/tnetwork.h ./src/tcharmap.h
-./src/tnetwork.o: ./src/tnetwork.h
-./src/tnmain.o: ./src/tnmain.h ./src/tncon.h ./src/tparams.h ./src/ttelhndl.h
-./src/tnmain.o: ./src/tparser.h ./src/tconsole.h ./src/tnconfig.h
-./src/tnmain.o: ./src/tnerror.h ./src/tnmsg.h ./src/keytrans.h
-./src/tnmain.o: ./src/tkeydef.h ./src/tkeymap.h ./src/stl_bids.h
-./src/tnmain.o: ./src/tscroll.h ./src/tmouse.h ./src/tnclip.h
-./src/tnmain.o: ./src/tnetwork.h ./src/tcharmap.h ./src/tnclass.h
-./src/tnmain.o: ./src/ansiprsr.h ./src/tmapldr.h ./src/tnmisc.h
-./src/tnmisc.o: ./src/tnmisc.h
-./src/tscript.o: ./src/tscript.h ./src/tnetwork.h
-./src/tscroll.o: ./src/tscroll.h ./src/tconsole.h ./src/tnconfig.h
-./src/tscroll.o: ./src/tnerror.h ./src/tnmsg.h ./src/tmouse.h ./src/tnclip.h
-./src/tscroll.o: ./src/tnetwork.h ./src/tncon.h ./src/tparams.h
-./src/tscroll.o: ./src/ttelhndl.h ./src/tparser.h ./src/keytrans.h
-./src/tscroll.o: ./src/tkeydef.h ./src/tkeymap.h ./src/stl_bids.h
-./src/tscroll.o: ./src/tcharmap.h
-./src/ttelhndl.o: ./src/ttelhndl.h ./src/tparser.h ./src/tconsole.h
-./src/ttelhndl.o: ./src/tnconfig.h ./src/tnerror.h ./src/tnmsg.h
-./src/ttelhndl.o: ./src/keytrans.h ./src/tkeydef.h ./src/tkeymap.h
-./src/ttelhndl.o: ./src/stl_bids.h ./src/tscroll.h ./src/tmouse.h
-./src/ttelhndl.o: ./src/tnclip.h ./src/tnetwork.h ./src/tcharmap.h
-./src/ttelhndl.o: ./src/telnet.h ./src/tparams.h
+# EOF
diff --git a/rosapps/net/telnet/telnet.rc b/rosapps/net/telnet/telnet.rc
new file mode 100644
index 00000000000..aa9e5feb47e
--- /dev/null
+++ b/rosapps/net/telnet/telnet.rc
@@ -0,0 +1,39 @@
+#include <defines.h>
+#include <reactos/resource.h>
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+VS_VERSION_INFO VERSIONINFO
+	FILEVERSION	RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+	PRODUCTVERSION	RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD	
+	FILEFLAGSMASK	0x3fL
+#ifdef _DEBUG
+	FILEFLAGS	0x1L
+#else
+	FILEFLAGS	0x0L
+#endif
+	FILEOS		0x40004L
+	FILETYPE	0x2L
+	FILESUBTYPE	0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName",	RES_STR_COMPANY_NAME
+            VALUE "FileDescription",	"Console Telnet for Win32\0"
+            VALUE "FileVersion",	RES_STR_FILE_VERSION
+            VALUE "InternalName",	"ping\0"
+            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalCopyright",	"Paul Brannan (cout@users.sourceforge.net)\0"
+            VALUE "OriginalFilename",	"telnet.exe\0"
+            VALUE "ProductName",	RES_STR_PRODUCT_NAME
+            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+