diff --git a/debian/changelog b/debian/changelog
index 0e6613dbe..10d8cb2c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -128,6 +128,8 @@ linux (4.5.2-1) UNRELEASED; urgency=medium
     Thierry Herbelot (Closes: #822666)
   * memcg: remove lru_add_drain_all() invocation from mem_cgroup_move_charge()
     (Closes: #822084)
+  * linux-perf: Add build-time check for unversioned files that are likely to
+    result in file conflicts
 
   [ Aurelien Jarno ]
   * [mips*] Emulate unaligned LDXC1 and SDXC1 instructions.
diff --git a/debian/rules.d/tools/perf/Makefile b/debian/rules.d/tools/perf/Makefile
index 6813e8302..5be6fa726 100644
--- a/debian/rules.d/tools/perf/Makefile
+++ b/debian/rules.d/tools/perf/Makefile
@@ -70,3 +70,5 @@ endif
 	mv $(DESTDIR)/etc/bash_completion.d \
 		$(DESTDIR)/usr/share/bash-completion/completions
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc
+# Check for unversioned files that are likely to result in file conflicts
+	! find $(DESTDIR) -name '*perf*' \! -path '*[_-]$(VERSION)*' | grep .