diff --git a/cyphesis-0.6.0-unversioned-docdir.patch b/cyphesis-0.6.0-unversioned-docdir.patch
new file mode 100644
index 0000000..1f81e68
--- /dev/null
+++ b/cyphesis-0.6.0-unversioned-docdir.patch
@@ -0,0 +1,23 @@
+diff -up cyphesis-0.6.0/Makefile.am.docdir cyphesis-0.6.0/Makefile.am
+--- cyphesis-0.6.0/Makefile.am.docdir	2014-04-22 21:13:30.000000000 +0200
++++ cyphesis-0.6.0/Makefile.am	2014-04-22 21:40:00.060342036 +0200
+@@ -2,7 +2,6 @@
+ SUBDIRS = libraries physics common modules rulesets server client data \
+           tools tests man dox
+ 
+-docdir = $(datadir)/doc/cyphesis-$(VERSION)
+ dist_doc_DATA = README COPYING AUTHORS THANKS NEWS FIXME
+ 
+ rulesetdir = $(datadir)/cyphesis/rulesets
+diff -up cyphesis-0.6.0/Makefile.in.docdir cyphesis-0.6.0/Makefile.in
+--- cyphesis-0.6.0/Makefile.in.docdir	2012-11-09 22:39:18.000000000 +0100
++++ cyphesis-0.6.0/Makefile.in	2014-04-22 21:40:12.426397063 +0200
+@@ -255,7 +255,7 @@ build_vendor = @build_vendor@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(datadir)/doc/cyphesis-$(VERSION)
++docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
diff --git a/cyphesis.spec b/cyphesis.spec
index 8041e41..a6aed84 100644
--- a/cyphesis.spec
+++ b/cyphesis.spec
@@ -19,6 +19,7 @@ Patch0:         cyphesis-0.5.19-init.patch
 Patch1:         cyphesis-0.5.11-logdir.patch
 Patch5:         cyphesis-0.5.21-dso-linking.patch
 Patch7:         cyphesis-socketdir.patch
+Patch8:         cyphesis-0.6.0-unversioned-docdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel libgcrypt-devel pkgconfig atlascpp-devel
 BuildRequires:  varconf-devel libsigc++20-devel mercator-devel skstream-devel
@@ -56,6 +57,7 @@ Logwatch scripts for the WorldForge game server.
 %patch1 -p0
 %patch5 -p1 -b .dso.linking
 %patch7 -p0
+%patch8 -p1 -b .docdir
 
 chmod a-x rulesets/basic/mind/dictlist.py
 chmod a-x rulesets/mason/world/objects/buildings/House.py