diff --git a/rc/core/doc.kak b/rc/core/doc.kak
index 342bc176c..33b96ed93 100644
--- a/rc/core/doc.kak
+++ b/rc/core/doc.kak
@@ -31,14 +31,14 @@ def -hidden -params 1..2 doc-open %{
 
 def -params 1..2 \
     -shell-candidates %{
-        find "${kak_runtime}/../doc/kak/manpages/" -type f -iname "*.gz" | while read l; do
+        find "${kak_runtime}/doc/" -type f -iname "*.gz" | while read l; do
             basename "${l%.*}"
         done
     } \
     doc -docstring %{doc <topic> [<keyword>]: open a buffer containing documentation about a given topic
 An optional keyword argument can be passed to the function, which will be automatically selected in the documentation} %{
     %sh{
-        readonly PATH_DOC="${kak_runtime}/../doc/kak/manpages/${1}.gz"
+        readonly PATH_DOC="${kak_runtime}/doc/${1}.gz"
 
         shift
         if [ -f "${PATH_DOC}" ]; then
diff --git a/share/doc/kak/manpages b/share/doc/kak/manpages
deleted file mode 120000
index 9f6cd9d0d..000000000
--- a/share/doc/kak/manpages
+++ /dev/null
@@ -1 +0,0 @@
-../../../doc/manpages
\ No newline at end of file
diff --git a/src/Makefile b/src/Makefile
index 72191e509..4e95e07c8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -112,19 +112,20 @@ installdirs:
 		$(sharedir)/rc/core \
 		$(sharedir)/rc/extra \
 		$(sharedir)/colors \
-		$(docdir)/manpages \
+		$(sharedir)/doc \
+		$(docdir) \
 		$(mandir)
 
 install: kak man doc installdirs
 	install -m 0755 kak $(bindir)
 	install -m 0644 ../share/kak/kakrc $(sharedir)
+	install -m 0644 ../doc/manpages/*.gz $(sharedir)/doc
 	install -m 0644 ../rc/base/* $(sharedir)/rc/base
 	install -m 0644 ../rc/core/* $(sharedir)/rc/core
 	install -m 0644 ../rc/extra/* $(sharedir)/rc/extra
 	[ -e $(sharedir)/autoload ] || ln -s rc $(sharedir)/autoload
 	install -m 0644 ../colors/* $(sharedir)/colors
 	install -m 0644 ../README.asciidoc $(docdir)
-	install -m 0644 ../doc/manpages/*.gz $(docdir)/manpages
 	install -m 0644 ../doc/kak.1.gz $(mandir)
 
 install-strip: install