diff -ur openssl/doc/apps/pkcs12.pod openssl-new/doc/apps/pkcs12.pod
--- openssl/doc/apps/pkcs12.pod	2013-02-11 15:26:04.000000000 +0000
+++ openssl-new/doc/apps/pkcs12.pod	2013-05-29 23:09:47.549167147 +0100
@@ -24,7 +24,7 @@
 [B<-nokeys>]
 [B<-info>]
 [B<-des | -des3 | -idea | -aes128 | -aes192 | -aes256 | -camellia128 | -camellia192 | -camellia256 | -nodes>]
-[B<-noiter>]
+[B<-iter>]
 [B<-maciter | -nomaciter | -nomac>]
 [B<-twopass>]
 [B<-descert>]
@@ -249,10 +249,21 @@
 MSIE 4.0 doesn't support MAC iteration counts so it needs the B<-nomaciter>
 option.
 
-=item B<-maciter>
+=item B<-iter num>
 
-This option is included for compatibility with previous versions, it used
-to be needed to use MAC iterations counts but they are now used by default.
+this affects the iteration count on the key algorithm.
+
+To discourage attacks by using large dictionaries of common
+passwords the algorithm that derives keys from passwords can have
+an iteration count applied to it: this causes a certain part of the
+algorithm to be repeated and slows it down.
+By default the encryption count is set to 2048, using this option the
+encryption count can be set between 1 and 2^31. B<Note> setting a very
+large value here may cause the key algorithm to take a very long time!
+
+=item B<-maciter num>
+
+performs the same operation as B<-iter> but performs it on the MAC.
 
 =item B<-nomac>
 
diff -ur openssl/doc/apps/pkcs8.pod openssl-new/doc/apps/pkcs8.pod
--- openssl/doc/apps/pkcs8.pod	2013-02-11 15:26:04.000000000 +0000
+++ openssl-new/doc/apps/pkcs8.pod	2013-05-29 22:56:07.401324194 +0100
@@ -14,7 +14,7 @@
 [B<-passin arg>]
 [B<-out filename>]
 [B<-passout arg>]
-[B<-noiter>]
+[B<-iter>]
 [B<-nocrypt>]
 [B<-nooct>]
 [B<-embed>]
@@ -75,6 +75,18 @@
 the output file password source. For more information about the format of B<arg>
 see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>.
 
+=item B<-iter num>
+
+this affects the iteration count on the key algorithm.
+
+To discourage attacks by using large dictionaries of common
+passwords the algorithm that derives keys from passwords can have
+an iteration count applied to it: this causes a certain part of the
+algorithm to be repeated and slows it down. 
+By default the encryption count is set to 2048, using this option the
+encryption count can be set between 1 and 2^31. B<Note> setting a very
+large value here may cause the key algorithm to take a very long time!
+
 =item B<-nocrypt>
 
 PKCS#8 keys generated or input are normally PKCS#8 EncryptedPrivateKeyInfo