diff --git a/.hgignore b/.hgignore
index b27604e4b2..49a8440922 100644
--- a/.hgignore
+++ b/.hgignore
@@ -184,6 +184,7 @@
 ^tools/xm-test/ramdisk/buildroot
 ^xen/BLOG$
 ^xen/TAGS$
+^xen/cscope\.*$
 ^xen/arch/x86/asm-offsets\.s$
 ^xen/arch/x86/boot/mkelf32$
 ^xen/arch/x86/xen\.lds$
diff --git a/xen/Makefile b/xen/Makefile
index 631f0c791f..1f84dce860 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -135,16 +135,20 @@ define all_sources
       find $(SUBDIRS) -name SCCS -prune -o -name '*.[chS]' -print )
 endef
 
-.PHONY: TAGS
-TAGS: 
+.PHONY: cscope TAGS tags
+cscope TAGS tags:
+	make -f $(BASEDIR)/Rules.mk _$@
+
+.PHONY: _TAGS
+_TAGS: 
 	$(all_sources) | etags -
 
-.PHONY: tags
-tags: 
+.PHONY: _tags
+_tags: 
 	$(all_sources) | xargs ctags
 
-.PHONY: cscope
-cscope: 
+.PHONY: _cscope
+_cscope:
 	$(all_sources) > cscope.files
 	cscope -k -b -q