diff --git a/ChangeLog b/ChangeLog
index 760ca25..1b9f3b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-17  Ben Elliston  <bje@gnu.org>
+
+	* Makefile (UPLOAD, upload): Remove variable and target.
+	(all): Make this a dummy target.
+
 2009-08-17  Michael Eager  <eager@eagercon.com>
 
 	* config.sub: Add Microblaze aliases.
diff --git a/Makefile b/Makefile
index f99ebce..ac0944b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,4 @@
-UPLOAD=ftp://ftp-upload.gnu.org/incoming/ftp/
-
 all:
-	@echo "Type 'make upload' to upload to the GNU FTP server."
-
-upload:
-	gpg --detach-sign config.guess 
-	gpg --detach-sign config.sub
-	echo "directory: config" | gpg --clearsign > config.guess.directive.asc
-	cp config.guess.directive.asc config.sub.directive.asc
-	ftp -a -u $(UPLOAD) config.{guess,sub}{,.sig,.directive.asc}
-	rm config.{guess,sub}{.sig,.directive.asc}
 
 check:
 	cd testsuite && (sh config-sub.sh; sh config-guess.sh) && rm uname