diff --git a/doc/tools/pkcs15-tool.xml b/doc/tools/pkcs15-tool.xml
index 90d5bbc3..8bb3ef9e 100644
--- a/doc/tools/pkcs15-tool.xml
+++ b/doc/tools/pkcs15-tool.xml
@@ -67,7 +67,7 @@
 					For some cards the PKCS#15 attributes of the private data objects are 
 					protected for reading and need the authentication with the User PIN.
 					In such a case the <option>--verify-pin</option> option has to be used.
-                                        </para></listitem>
+					</para></listitem>
 				</varlistentry>
 
 				<varlistentry>
@@ -83,14 +83,14 @@
 
 				<varlistentry>
 					<term><option>--change-pin</option></term>
-					<listitem><para>Changes a PIN stored on the token. User authentication
+					<listitem><para>Changes a PIN or PUK stored on the token. User authentication
 					is required for this operation.</para></listitem>
 				</varlistentry>
 
 				<varlistentry>
 					<term><option>--unblock-pin, -u</option></term>
 					<listitem><para>Unblocks a PIN stored on the token. Knowledge of the 
-                                        Pin Unblock Key (PUK) is required for this operation.</para></listitem>
+					Pin Unblock Key (PUK) is required for this operation.</para></listitem>
 				</varlistentry>
 
 				<varlistentry>