diff --git a/doc/pyOpenSSL.tex b/doc/pyOpenSSL.tex
index 5d5ca9d..19271ac 100644
--- a/doc/pyOpenSSL.tex
+++ b/doc/pyOpenSSL.tex
@@ -263,7 +263,9 @@
 \begin{funcdesc}{load_pkcs12}{buffer\optional{, passphrase}}
 Load pkcs12 data from the string \var{buffer}. If the pkcs12 structure is
 encrypted, a \var{passphrase} must be included.  The MAC is always
-checked and thus required.
+checked and thus required.  
+
+See also the man page for the C function \function{PKCS12_parse}.
 \end{funcdesc}
 
 \subsubsection{X509 objects \label{openssl-x509}}
@@ -525,7 +527,7 @@
 
 PKCS12 objects have the following methods:
 
-\begin{methoddesc}[PKCS12]{export}{\optional{passphrase=None}\optional{, friendly_name=None}\optional{, iter=2000}\optional{, maciter=0}}
+\begin{methoddesc}[PKCS12]{export}{\optional{passphrase=None}\optional{, iter=2048}\optional{, maciter=1}}
 Returns a PKCS12 object as a string.
 
 The optional \var{passphrase} must be a string not a callback.
@@ -542,6 +544,10 @@
 Return certificate portion of the PKCS12 structure.
 \end{methoddesc}
 
+\begin{methoddesc}[PKCS12]{get_friendlyname}{}
+Return friendlyName portion of the PKCS12 structure.
+\end{methoddesc}
+
 \begin{methoddesc}[PKCS12]{get_privatekey}{}
 Return private key portion of the PKCS12 structure
 \end{methoddesc}
@@ -556,6 +562,10 @@
 Replace or set the certificate portion of the PKCS12 structure.
 \end{methoddesc}
 
+\begin{methoddesc}[PKCS12]{set_friendlyname}{name}
+Replace or set the friendlyName portion of the PKCS12 structure.
+\end{methoddesc}
+
 \begin{methoddesc}[PKCS12]{set_privatekey}{pkey}
 Replace or set private key portion of the PKCS12 structure
 \end{methoddesc}