diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index c6998f6e8e5..cd9a00e074b 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -18,5 +18,5 @@ options-db.xml: options.xml options-to-docbook.xsl
 	xsltproc -o options-db.xml options-to-docbook.xsl options.xml 
 
 options.xml: ../../system/options.nix
-	echo 'import ../../system/options.nix {pkgs = import ../../pkgs/top-level/all-packages.nix {};}' | \
+	echo 'let pkgs = import ../../pkgs/top-level/all-packages.nix {}; in pkgs.lib.optionAttrSetToDocList (import ../../system/options.nix rec {pkgs = pkgs {}; mkOption = pkgs.lib.mkOption; })' | \
 	    nix-instantiate --eval-only --xml --strict - > options.xml || (rm options.xml && false)
diff --git a/doc/manual/userconfiguration.xml b/doc/manual/userconfiguration.xml
index 6e20afec9ab..5c74c05e879 100644
--- a/doc/manual/userconfiguration.xml
+++ b/doc/manual/userconfiguration.xml
@@ -45,4 +45,30 @@
 </para>
 </section>
 
+<section>
+<title>Pidgin-LaTeX</title>
+<para>
+	To have pidgin-latex plugin working after installation, you need the following:
+	<orderedlist>
+	<listitem>
+	Symlink <filename>/var/run/current-system/sw/share/pidgin-latex/pidgin-latex.so</filename>
+	to <filename>$HOME/.purple/plugins/pidgin-latex.so</filename>
+	</listitem>
+	<listitem>
+	Enable smileys. If you do not want to, you can create 
+	<filename>$HOME/.purple/smileys/empty/theme</filename> with the following contents: 
+	<programlisting>
+	Name=Empty
+	Description=No predefined smileys
+	Author=Nobody
+	</programlisting>	
+	Enabling this theme will enable smileys, but define none.
+	</listitem>
+	<listitem>
+	Enable the plugin.
+	</listitem>	
+	</orderedlist>	
+	</para>
+	</section>
+
 </chapter>