diff --git a/make/rules.mk b/make/rules.mk
index d14b7115..c4c1c470 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -94,7 +94,10 @@ love:
 	@echo "Not war?"
 
 cvsupdate update:
-	cvs update -dP
+	if [ -d "CVS" ]; then cvs update -dP; else git pull origin master; fi
+
+cvsdiff diff:
+	if [ -d "CVS" ]; then cvs diff -dP; else git --no-pager diff; fi
 
 prepend_header:
 	set -e; for f in $(SRC_UNHEADERED); do sh $(TOPDIR)/hdr/prepend_header.sh $$f; done