diff -up ./pynicotine/gtkgui/frame.py.orig ./pynicotine/gtkgui/frame.py
--- ./pynicotine/gtkgui/frame.py.orig	2017-02-12 13:27:48.000000000 +0100
+++ ./pynicotine/gtkgui/frame.py	2017-02-13 12:32:56.635437036 +0100
@@ -2521,6 +2521,9 @@ class NicotineFrame:
 
         paths.append(os.getcwd())
 
+        path1 = "%s/share/nicotine" % sys.prefix
+        paths.append(path1)
+
         # For distros that puts documentation in /usr/share/doc
         path2 = "%s/share/doc/nicotine" % sys.prefix
         paths.append(path2)
diff -up ./setup.py.orig ./setup.py
--- ./setup.py.orig	2017-02-12 13:27:48.000000000 +0100
+++ ./setup.py	2017-02-13 12:32:44.487414755 +0100
@@ -106,14 +106,14 @@ for sounds in sound_dirs:
         )
 
 # Documentation
-for (path, dirs, docfiles) in os.walk("doc"):
+for (path, dirs, docfiles) in os.walk("doc/NicotinePlusGuide"):
 
     dst_path = os.sep.join(path.split("/")[1:])
 
     for f in docfiles:
         files.append(
             (
-                os.path.join(sys.prefix, "share/doc/nicotine", dst_path),
+                os.path.join(sys.prefix, "share/nicotine", dst_path),
                 [os.path.join(path, f)]
             )
         )