diff --git a/make/upload.mk b/make/upload.mk
index 1c435d05..0551aeec 100644
--- a/make/upload.mk
+++ b/make/upload.mk
@@ -18,6 +18,12 @@ UPLOAD_LAST_VERSION   ?= $(shell $(CAT) $(UPLOAD_LAST_VERSION_FILE) 2>/dev/null)
 REMOTE_TARGETS        ?= \
 	$(foreach f,$(UPLOAD_FILES),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP))
 
+ifneq ($(wildcard CVS),)
+UPLOAD_SCM = cvs
+else
+UPLOAD_SCM = git
+endif
+
 all:
 upload: upload.dist
 
@@ -30,7 +36,8 @@ ifneq ($(UPLOAD_LAST_VERSION),$(VERSION))
 	make $(REMOTE_TARGETS)
 ifeq ($(UPLOAD_TEST_PREFIX),)
 	echo $(VERSION) > $(UPLOAD_LAST_VERSION_FILE)
-	cvs commit -m "o $(VERSION)" $(UPLOAD_LAST_VERSION_FILE)
+	$(UPLOAD_SCM) add $(UPLOAD_LAST_VERSION_FILE)
+	$(UPLOAD_SCM) commit -m "$(VERSION)" $(UPLOAD_LAST_VERSION_FILE)
 endif
 endif
 	touch $@.done
@@ -38,8 +45,8 @@ endif
 is-uploaded:
 ifneq ($(UPLOAD_LAST_VERSION),$(VERSION))
 	echo $(VERSION) > $(UPLOAD_LAST_VERSION_FILE)
-	cvs add $(UPLOAD_LAST_VERSION_FILE)
-	cvs commit -m "initial checkin" $(UPLOAD_LAST_VERSION_FILE)
+	$(UPLOAD_SCM) add $(UPLOAD_LAST_VERSION_FILE)
+	$(UPLOAD_SCM) commit -m "`cat $(UPLOAD_LAST_VERSION_FILE)`" $(UPLOAD_LAST_VERSION_FILE)
 endif
 	touch upload.dist.done