diff --git a/packages/dev-perl/razor/files/razor-2.85-Makefile-quoting.patch b/packages/dev-perl/razor/files/razor-2.85-Makefile-quoting.patch
new file mode 100644
index 00000000..eb616615
--- /dev/null
+++ b/packages/dev-perl/razor/files/razor-2.85-Makefile-quoting.patch
@@ -0,0 +1,19 @@
+Source: Arch Linux
+Upstream: no idea
+Reason: yes
+
+diff -uprw razor-agents-2.85.orig/Makefile.PL razor-agents-2.85/Makefile.PL
+--- razor-agents-2.85.orig/Makefile.PL	2007-05-09 01:47:53.000000000 +0300
++++ razor-agents-2.85/Makefile.PL	2015-06-14 20:36:23.677213987 +0300
+@@ -140,9 +140,9 @@ sub MY::install {
+   my $inherited = $self->SUPER::install(@_);
+ 
+   my $man5 = q{ \\
+-		$(INST_MAN5DIR) $(INSTALLMAN5DIR)};
++		"$(INST_MAN5DIR)" "$(INSTALLMAN5DIR)"};
+ 
+-  $inherited =~ s/(\$\((?:DEST)?INSTALL\w*MAN1DIR\))/$1$man5/gm;
++  $inherited =~ s/("?\$\((?:DEST)?INSTALL\w*MAN1DIR\)"?)/$1$man5/gm;
+ 
+   return $inherited;
+ }
diff --git a/packages/dev-perl/razor/razor-2.85-r1.exheres-0 b/packages/dev-perl/razor/razor-2.85-r1.exheres-0
new file mode 100644
index 00000000..4ee15fa7
--- /dev/null
+++ b/packages/dev-perl/razor/razor-2.85-r1.exheres-0
@@ -0,0 +1,43 @@
+# Copyright 2016 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require perl-module
+require sourceforge [ pnv="razor-agents-${PV}" ]
+
+SUMMARY="Vipul's Razor is a distributed, collaborative spam detection and filtering network"
+
+LICENCES="Artistic"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+
+DEPENDENCIES="
+    build+run:
+        dev-perl/Digest-Nilsimsa
+        dev-perl/Digest-SHA1
+        dev-perl/Net-DNS
+        dev-perl/URI
+"
+
+WORK=${WORKBASE}/razor-agents-${PV}
+
+DEFAULT_SRC_PREPARE_PATCHES=(
+    "${FILES}"/${PNV}-Makefile-quoting.patch
+)
+
+src_install() {
+    perl-module_src_install
+
+    # utterly broken shit, doesn't honour INSTALLMAN1DIR etc
+    # no, I'm not hacking on perl build systems
+    dodir /usr/share/man
+    edo mv "${IMAGE%/}"/usr/$(exhost --target)/man/man1 \
+        "${IMAGE%/}"/usr/share/man/man1
+    edo mv "${IMAGE%/}"/usr/$(exhost --target)/man/man3 \
+        "${IMAGE%/}"/usr/share/man/man3
+    edo mv "${IMAGE%/}"/usr/$(exhost --target)/share/man/man5 \
+        "${IMAGE%/}"/usr/share/man/man5
+    edo rmdir "${IMAGE%/}"/usr/$(exhost --target)/man \
+        "${IMAGE%/}"/usr/$(exhost --target)/share/man \
+        "${IMAGE%/}"/usr/$(exhost --target)/share
+}
+
diff --git a/packages/dev-perl/razor/razor-2.85.exheres-0 b/packages/dev-perl/razor/razor-2.85.exheres-0
deleted file mode 100644
index 000a48f3..00000000
--- a/packages/dev-perl/razor/razor-2.85.exheres-0
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2016 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require perl-module
-require sourceforge [ pnv="razor-agents-${PV}" ]
-
-SUMMARY="Vipul's Razor is a distributed, collaborative spam detection and filtering network"
-
-LICENCES="Artistic"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-
-DEPENDENCIES="
-    build+run:
-        dev-perl/Digest-Nilsimsa
-        dev-perl/Digest-SHA1
-        dev-perl/Net-DNS
-        dev-perl/URI
-"
-
-WORK=${WORKBASE}/razor-agents-${PV}
-