diff --git a/debian/changelog b/debian/changelog
index 9afe73414..ccca4c784 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ linux-2.6 (2.6.36~rc7-1~experimental.1) UNRELEASED; urgency=low
   * [x86] Staging: fix Makefile so brcm80211 will actually build
     (Closes: #599465)
   * [x86] Enable modular IDEAPAD_ACPI (Closes: #599444)
-  * perf: Move scripts to /usr/share/perf_<version>-core (Closes: #599624)
+  * perf: Enable Perl and Python scripting
+    - Move scripts to /usr/share/perf_<version>-core (Closes: #599624)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Thu, 07 Oct 2010 03:24:21 +0100
 
diff --git a/debian/patches/bugfix/all/perf-Fix-detection-of-script-extension.patch b/debian/patches/bugfix/all/perf-Fix-detection-of-script-extension.patch
new file mode 100644
index 000000000..4be4cf6f6
--- /dev/null
+++ b/debian/patches/bugfix/all/perf-Fix-detection-of-script-extension.patch
@@ -0,0 +1,28 @@
+From cf22a40e611cd1aeda44bca29d86e5d34ff90dc5 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sun, 10 Oct 2010 03:31:00 +0100
+Subject: [PATCH] perf: Fix detection of script extension
+
+The extension starts with the last dot in the name, not the first.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ tools/perf/builtin-trace.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
+index 3ea6219..deda1a9 100644
+--- a/tools/perf/builtin-trace.c
++++ b/tools/perf/builtin-trace.c
+@@ -282,7 +282,7 @@ static int parse_scriptname(const struct option *opt __used,
+ 		script++;
+ 	} else {
+ 		script = str;
+-		ext = strchr(script, '.');
++		ext = strrchr(script, '.');
+ 		if (!ext) {
+ 			fprintf(stderr, "invalid script extension");
+ 			return -1;
+-- 
+1.7.1
+
diff --git a/debian/patches/series/base b/debian/patches/series/base
index 9c2151879..d6c940ba5 100644
--- a/debian/patches/series/base
+++ b/debian/patches/series/base
@@ -48,3 +48,4 @@
 + bugfix/all/vivi-Don-t-depend-on-FONTS.patch
 + bugfix/all/qla4xxx-Fix-build-on-some-architectures-lacking-64-bit-I-O.patch
 + bugfix/all/perf-Use-PERF_EXEC_PATH-in-canned-report-scripts.patch
++ bugfix/all/perf-Fix-detection-of-script-extension.patch
diff --git a/debian/rules.real b/debian/rules.real
index fe39dd842..889480770 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -503,6 +503,8 @@ install-tools_$(ARCH): $(STAMPS_DIR)/build-tools_$(ARCH)
 	# Fix up cross-references
 	sed -i '/^\.SH "SEE ALSO"/,/^\.SH/ { s/perf-/perf_$(VERSION)-/g }' \
 		$(PACKAGE_DIR)/usr/share/man/*/*
+	dh_perl /usr/share/perf_$(VERSION)-core/scripts/perl/Perf-Trace-Util/lib/
+	dh_pysupport /usr/share/perf_$(VERSION)-core/scripts/python/Perf-Trace-Util/lib/
 	+$(MAKE_SELF) install-base
 
 install-patch: PACKAGE = linux-patch-debian-$(VERSION)
diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in
index d56418fdc..876744536 100644
--- a/debian/templates/control.main.in
+++ b/debian/templates/control.main.in
@@ -1,6 +1,6 @@
 Package: linux-tools-@version@
 Architecture: alpha amd64 armel hppa i386 powerpc s390 sh4 sparc sparc64
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}
 Recommends: linux-base (>= 2.6.32-16)
 Suggests: linux-doc-@version@
 Description: Performance analysis tools for Linux @upstreamversion@
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 377d3b46d..28b2adc58 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: Bastian Blank <waldi@debian.org>, Frederik Schüler <fs@debian.org>, maximilian attems <maks@debian.org>, Ben Hutchings <ben@decadent.org.uk>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>> 7), cpio, module-init-tools, python, lzma [armel], libelf-dev, binutils-dev, asciidoc, xmlto
-Build-Depends-Indep: bzip2, python-support
+Build-Depends: debhelper (>> 7), cpio, module-init-tools, python, lzma [armel], libelf-dev, binutils-dev, asciidoc, xmlto, libperl-dev, python-dev, python-support
+Build-Depends-Indep: bzip2
 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/sid/linux-2.6/
 Vcs-Browser: http://svn.debian.org/wsvn/kernel/dists/sid/linux-2.6/?op=log