diff --git a/debian/changelog b/debian/changelog
index 054956a77..d01121e46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 linux-2.6 (2.6.35~rc5-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release candidate
+  
+  [ Ben Hutchings ]
+  * Consistently name the linux-tools package and perf binary using the
+    upstream version without any -rcN suffix
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 13 Jul 2010 00:50:20 +0100
 
diff --git a/debian/rules.real b/debian/rules.real
index 4304a15a6..0d938f3a3 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -482,7 +482,7 @@ ifeq ($(MODULES),True)
 endif
 	+$(MAKE_SELF) install-base BUILDDEB_ARGS="-Zbzip2"
 
-install-tools_$(ARCH): PACKAGE_NAME = linux-tools-$(UPSTREAMVERSION)
+install-tools_$(ARCH): PACKAGE_NAME = linux-tools-$(VERSION)
 install-tools_$(ARCH): PACKAGE_DIR = debian/$(PACKAGE_NAME)
 install-tools_$(ARCH): DIR = $(BUILD_DIR)/build-tools_$(ARCH)
 install-tools_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
@@ -494,12 +494,12 @@ install-tools_$(ARCH): $(STAMPS_DIR)/build-tools_$(ARCH)
 	+$(MAKE_CLEAN) -C '$(DIR)/tools/perf' $(MAKE_PERF_VARS) \
 		DESTDIR='$(CURDIR)/$(PACKAGE_DIR)' install install-man
 	# Rename command and manual pages to include version
-	mv $(PACKAGE_DIR)/usr/bin/perf $(PACKAGE_DIR)/usr/bin/perf_$(UPSTREAMVERSION)
+	mv $(PACKAGE_DIR)/usr/bin/perf $(PACKAGE_DIR)/usr/bin/perf_$(VERSION)
 	for manpage in $(PACKAGE_DIR)/usr/share/man/*/*; do \
-		mv "$$manpage" "$$(echo "$$manpage" | sed 's,/perf,&_$(UPSTREAMVERSION),')" || exit; \
+		mv "$$manpage" "$$(echo "$$manpage" | sed 's,/perf,&_$(VERSION),')" || exit; \
 	done
 	# Fix up cross-references
-	sed -i '/^\.SH "SEE ALSO"/,/^\.SH/ { s/perf-/perf_$(UPSTREAMVERSION)-/g }' \
+	sed -i '/^\.SH "SEE ALSO"/,/^\.SH/ { s/perf-/perf_$(VERSION)-/g }' \
 		$(PACKAGE_DIR)/usr/share/man/*/*
 	+$(MAKE_SELF) install-base