diff --git a/reactos/lib/kernel32/makefile b/reactos/lib/kernel32/makefile
index afa57a80f56..f7d6ad3067a 100644
--- a/reactos/lib/kernel32/makefile
+++ b/reactos/lib/kernel32/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.48 2001/07/15 21:18:54 rex Exp $
+# $Id: makefile,v 1.49 2001/08/02 20:25:16 phreak Exp $
 #
 # ReactOS Operating System
 #
@@ -141,3 +141,9 @@ $(DIST_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
 WITH_DEBUGGING=yes
 #WARNINGS_ARE_ERRORS = yes
 include ../../rules.mak
+
+%/TAGS:
+	etags -o $(@D)/TAGS $(@D)/\*.c
+
+etags: except/TAGS file/TAGS mem/TAGS misc/TAGS nls/TAGS process/TAGS string/TAGS synch/TAGS thread/TAGS
+	etags -i except/TAGS -i file/TAGS -i mem/TAGS -i misc/TAGS -i nls/TAGS -i process/TAGS -i string/TAGS -i synch/TAGS -i thread/TAGS
diff --git a/reactos/lib/ntdll/makefile b/reactos/lib/ntdll/makefile
index 76c92493093..75408b14dd8 100644
--- a/reactos/lib/ntdll/makefile
+++ b/reactos/lib/ntdll/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.63 2001/07/15 21:18:55 rex Exp $
+# $Id: makefile,v 1.64 2001/08/02 20:25:17 phreak Exp $
 #
 # ReactOS Operating System
 #
@@ -112,3 +112,9 @@ $(DIST_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
 	$(CP) $(TARGET).dll ../../$(DIST_DIR)/dlls/$(TARGET).dll
 
 include ../../rules.mak
+
+%/TAGS:
+	etags -o $(@D)/TAGS $(@D)/\*.c
+
+etags: csr/TAGS dbg/TAGS ldr/TAGS main/TAGS rtl/TAGS stdio/TAGS stdlib/TAGS string/TAGS stubs/TAGS
+	etags -i csr/TAGS -i dbg/TAGS -i ldr/TAGS -i main/TAGS -i rtl/TAGS -i stdio/TAGS -i stdlib/TAGS -i string/TAGS -i stubs/TAGS
\ No newline at end of file