diff --git a/debian/build/tools/perf/Makefile b/debian/build/tools/perf/Makefile
index 4199c3805..44382df6d 100644
--- a/debian/build/tools/perf/Makefile
+++ b/debian/build/tools/perf/Makefile
@@ -36,18 +36,14 @@ MAKE_PERF := $(MAKE) prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_GTK2=
 all:
 ifdef KERNEL_ARCH_PERF
 	-mkdir out
-	# upstream makefile is broken
-	cp -al $(top_srcdir)/tools/perf/Documentation doc
-	cp -al $(top_srcdir)/tools/perf/config config
 	+$(MAKE_PERF) -C $(top_srcdir)/tools/perf O=$(CURDIR)/out all VERSION=$(VERSION)
-	+$(MAKE_PERF) -C doc man VERSION=$(VERSION)
+	+$(MAKE_PERF) -C $(top_srcdir)/tools/perf/Documentation O=$(CURDIR)/out man VERSION=$(VERSION)
 endif
 
 install:
 ifdef KERNEL_ARCH_PERF
 	+$(MAKE_PERF) -C $(top_srcdir)/tools/perf O=$(CURDIR)/out install VERSION=$(VERSION)
-	+$(MAKE_PERF) -C doc install-man VERSION=$(VERSION)
 endif
 
 clean:
-	rm -rf config doc out
+	rm -rf out
diff --git a/debian/changelog b/debian/changelog
index b8c217492..eef3af58e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ linux-tools (3.11~rc4-1~exp1) UNRELEASED; urgency=low
 
   * New upstream release candidate
 
+  [ Ben Hutchings ]
+  * linux-tools: Build perf documentation out-of-tree, as this now works
+    and our previous workaround does not
+
  -- Ben Hutchings <ben@decadent.org.uk>  Thu, 08 Aug 2013 15:39:50 +0200
 
 linux-tools (3.10-2) unstable; urgency=low