diff --git a/debian/changelog b/debian/changelog
index 00c4e8d7a..f868bfd1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,8 @@ linux-2.6 (2.6.37~rc4-1~experimental.1) UNRELEASED; urgency=low
   * Enable USB_UAS (USB-attached SCSI) as module
   * serial: Enable USB_SERIAL_SAMBA as module
   * drm/nouveau: Enable DRM_I2C_SIL164 as module
+  * perf: Use libiberty, not libbfd, for symbol demangling
+    (Closes: #604750, #606050)
 
  -- maximilian attems <max@stro.at>  Wed, 31 Oct 2010 13:23:11 +0200
 
diff --git a/debian/rules.real b/debian/rules.real
index 562cced68..22a6bdcb5 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -32,7 +32,7 @@ setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_UPLOADER=$(UPLOADER) DIS
 MAKE_CLEAN = $(setup_env) $(MAKE)
 MAKE_SELF := $(MAKE) -f debian/rules.real $(MAKEOVERRIDES)
 MAKEOVERRIDES =
-MAKE_PERF_VARS = prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_PERL=1 V=2
+MAKE_PERF_VARS = prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_PERL=1 V=2 HAVE_CPLUS_DEMANGLE=1
 
 #
 # Targets