diff -up openssl-fips-0.9.8e/doc/apps/openssl.pod.manfix openssl-fips-0.9.8e/doc/apps/openssl.pod
--- openssl-fips-0.9.8e/doc/apps/openssl.pod.manfix	2007-09-19 02:02:45.000000000 +0200
+++ openssl-fips-0.9.8e/doc/apps/openssl.pod	2013-07-17 16:53:35.344845801 +0200
@@ -125,7 +125,7 @@ Generation of RSA Parameters.
 
 Online Certificate Status Protocol utility.
 
-=item L<B<passwd>|passwd(1)>
+=item L<B<passwd>|sslpasswd(1)>
 
 Generation of hashed passwords.
 
@@ -137,7 +137,7 @@ PKCS#12 Data Management.
 
 PKCS#7 Data Management.
 
-=item L<B<rand>|rand(1)>
+=item L<B<rand>|sslrand(1)>
 
 Generate pseudo-random bytes.
 
@@ -341,9 +341,9 @@ L<crl(1)|crl(1)>, L<crl2pkcs7(1)|crl2pkc
 L<dhparam(1)|dhparam(1)>, L<dsa(1)|dsa(1)>, L<dsaparam(1)|dsaparam(1)>,
 L<enc(1)|enc(1)>, L<gendsa(1)|gendsa(1)>,
 L<genrsa(1)|genrsa(1)>, L<nseq(1)|nseq(1)>, L<openssl(1)|openssl(1)>,
-L<passwd(1)|passwd(1)>,
+L<sslpasswd(1)|sslpasswd(1)>,
 L<pkcs12(1)|pkcs12(1)>, L<pkcs7(1)|pkcs7(1)>, L<pkcs8(1)|pkcs8(1)>,
-L<rand(1)|rand(1)>, L<req(1)|req(1)>, L<rsa(1)|rsa(1)>,
+L<sslrand(1)|sslrand(1)>, L<req(1)|req(1)>, L<rsa(1)|rsa(1)>,
 L<rsautl(1)|rsautl(1)>, L<s_client(1)|s_client(1)>,
 L<s_server(1)|s_server(1)>, L<s_time(1)|s_time(1)>,
 L<smime(1)|smime(1)>, L<spkac(1)|spkac(1)>,
diff -up openssl-fips-0.9.8e/doc/apps/smime.pod.manfix openssl-fips-0.9.8e/doc/apps/smime.pod
--- openssl-fips-0.9.8e/doc/apps/smime.pod.manfix	2006-06-09 17:42:16.000000000 +0200
+++ openssl-fips-0.9.8e/doc/apps/smime.pod	2013-07-17 16:53:35.345845817 +0200
@@ -265,28 +265,28 @@ encrypted data is used for other purpose
 
 =over 4
 
-=item 0
+=item C<0>
 
 the operation was completely successfully.
 
-=item 1 
+=item C<1>
 
 an error occurred parsing the command options.
 
-=item 2
+=item C<2>
 
 one of the input files could not be read.
 
-=item 3
+=item C<3>
 
 an error occurred creating the PKCS#7 file or when reading the MIME
 message.
 
-=item 4
+=item C<4>
 
 an error occurred decrypting or verifying the message.
 
-=item 5
+=item C<5>
 
 the message was verified correctly but an error occurred writing out
 the signers certificates.
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_accept.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_accept.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_accept.pod.manfix	2003-06-03 11:59:44.000000000 +0200
+++ openssl-fips-0.9.8e/doc/ssl/SSL_accept.pod	2013-07-17 16:57:03.617836245 +0200
@@ -44,12 +44,12 @@ The following return values can occur:
 
 =over 4
 
-=item 1
+=item C<1>
 
 The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
 established.
 
-=item 0
+=item C<0>
 
 The TLS/SSL handshake was not successful but was shut down controlled and
 by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_clear.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_clear.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_clear.pod.manfix	2002-02-27 09:08:57.000000000 +0100
+++ openssl-fips-0.9.8e/doc/ssl/SSL_clear.pod	2013-07-17 16:53:35.349845898 +0200
@@ -50,12 +50,12 @@ The following return values can occur:
 
 =over 4
 
-=item 0
+=item C<0>
 
 The SSL_clear() operation could not be performed. Check the error stack to
 find out the reason.
 
-=item 1
+=item C<1>
 
 The SSL_clear() operation was successful.
 
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_COMP_add_compression_method.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_COMP_add_compression_method.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_COMP_add_compression_method.pod.manfix	2013-07-17 12:30:39.000000000 +0200
+++ openssl-fips-0.9.8e/doc/ssl/SSL_COMP_add_compression_method.pod	2013-07-17 16:53:35.349845898 +0200
@@ -60,11 +60,11 @@ SSL_COMP_add_compression_method() may re
 
 =over 4
 
-=item 0
+=item C<0>
 
 The operation succeeded.
 
-=item 1
+=item C<1>
 
 The operation failed. Check the error queue to find out the reason.
 
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_connect.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_connect.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_connect.pod.manfix	2003-06-03 11:59:44.000000000 +0200
+++ openssl-fips-0.9.8e/doc/ssl/SSL_connect.pod	2013-07-17 16:56:43.854426631 +0200
@@ -41,12 +41,12 @@ The following return values can occur:
 
 =over 4
 
-=item 1
+=item C<1>
 
 The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
 established.
 
-=item 0
+=item C<0>
 
 The TLS/SSL handshake was not successful but was shut down controlled and
 by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_CTX_add_session.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_CTX_add_session.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_CTX_add_session.pod.manfix	2002-10-29 01:33:01.000000000 +0100
+++ openssl-fips-0.9.8e/doc/ssl/SSL_CTX_add_session.pod	2013-07-17 16:53:35.353845983 +0200
@@ -52,13 +52,13 @@ The following values are returned by all
 
 =over 4
 
-=item 0
+=item C<0>
 
  The operation failed. In case of the add operation, it was tried to add
  the same (identical) session twice. In case of the remove operation, the
  session was not found in the cache.
 
-=item 1
+=item C<1>
  
  The operation succeeded.
 
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_CTX_load_verify_locations.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_CTX_load_verify_locations.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_CTX_load_verify_locations.pod.manfix	2001-09-07 08:13:39.000000000 +0200
+++ openssl-fips-0.9.8e/doc/ssl/SSL_CTX_load_verify_locations.pod	2013-07-17 16:53:35.354846005 +0200
@@ -100,13 +100,13 @@ The following return values can occur:
 
 =over 4
 
-=item 0
+=item C<0>
 
 The operation failed because B<CAfile> and B<CApath> are NULL or the
 processing at one of the locations specified failed. Check the error
 stack to find out the reason.
 
-=item 1
+=item C<1>
 
 The operation succeeded.
 
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_CTX_set_client_CA_list.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_CTX_set_client_CA_list.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_CTX_set_client_CA_list.pod.manfix	2001-04-12 18:02:34.000000000 +0200
+++ openssl-fips-0.9.8e/doc/ssl/SSL_CTX_set_client_CA_list.pod	2013-07-17 16:54:37.273839574 +0200
@@ -66,11 +66,11 @@ values:
 
 =over 4
 
-=item 1
+=item C<1>
 
 The operation succeeded.
 
-=item 0
+=item C<0>
 
 A failure while manipulating the STACK_OF(X509_NAME) object occurred or
 the X509_NAME could not be extracted from B<cacert>. Check the error stack
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_CTX_set_session_id_context.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_CTX_set_session_id_context.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_CTX_set_session_id_context.pod.manfix	2004-06-14 15:27:28.000000000 +0200
+++ openssl-fips-0.9.8e/doc/ssl/SSL_CTX_set_session_id_context.pod	2013-07-17 16:53:35.358846090 +0200
@@ -64,13 +64,13 @@ return the following values:
 
 =over 4
 
-=item 0
+=item C<0>
 
 The length B<sid_ctx_len> of the session id context B<sid_ctx> exceeded
 the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error
 is logged to the error stack.
 
-=item 1
+=item C<1>
 
 The operation succeeded.
 
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_CTX_set_ssl_version.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_CTX_set_ssl_version.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_CTX_set_ssl_version.pod.manfix	2001-03-08 18:24:01.000000000 +0100
+++ openssl-fips-0.9.8e/doc/ssl/SSL_CTX_set_ssl_version.pod	2013-07-17 16:53:35.360846132 +0200
@@ -42,11 +42,11 @@ and SSL_set_ssl_method():
 
 =over 4
 
-=item 0
+=item C<0>
 
 The new choice failed, check the error stack to find out the reason.
 
-=item 1
+=item C<1>
 
 The operation succeeded.
 
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_do_handshake.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_do_handshake.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_do_handshake.pod.manfix	2002-07-19 13:05:49.000000000 +0200
+++ openssl-fips-0.9.8e/doc/ssl/SSL_do_handshake.pod	2013-07-17 16:55:03.530386725 +0200
@@ -45,12 +45,12 @@ The following return values can occur:
 
 =over 4
 
-=item 1
+=item C<1>
 
 The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
 established.
 
-=item 0
+=item C<0>
 
 The TLS/SSL handshake was not successful but was shut down controlled and
 by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_read.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_read.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_read.pod.manfix	2001-09-13 15:21:38.000000000 +0200
+++ openssl-fips-0.9.8e/doc/ssl/SSL_read.pod	2013-07-17 16:53:45.846069565 +0200
@@ -81,7 +81,7 @@ The following return values can occur:
 The read operation was successful; the return value is the number of
 bytes actually read from the TLS/SSL connection.
 
-=item 0
+=item C<0>
 
 The read operation was not successful. The reason may either be a clean
 shutdown due to a "close notify" alert sent by the peer (in which case
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_session_reused.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_session_reused.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_session_reused.pod.manfix	2001-07-20 20:57:15.000000000 +0200
+++ openssl-fips-0.9.8e/doc/ssl/SSL_session_reused.pod	2013-07-17 16:53:45.848069608 +0200
@@ -27,11 +27,11 @@ The following return values can occur:
 
 =over 4
 
-=item 0
+=item C<0>
 
 A new session was negotiated.
 
-=item 1
+=item C<1>
 
 A session was reused.
 
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_set_fd.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_set_fd.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_set_fd.pod.manfix	2000-09-16 18:00:38.000000000 +0200
+++ openssl-fips-0.9.8e/doc/ssl/SSL_set_fd.pod	2013-07-17 16:53:45.849069630 +0200
@@ -35,11 +35,11 @@ The following return values can occur:
 
 =over 4
 
-=item 0
+=item C<0>
 
 The operation failed. Check the error stack to find out why.
 
-=item 1
+=item C<1>
 
 The operation succeeded.
 
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_set_session.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_set_session.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_set_session.pod.manfix	2001-10-12 14:29:16.000000000 +0200
+++ openssl-fips-0.9.8e/doc/ssl/SSL_set_session.pod	2013-07-17 16:53:45.851069674 +0200
@@ -37,11 +37,11 @@ The following return values can occur:
 
 =over 4
 
-=item 0
+=item C<0>
 
 The operation failed; check the error stack to find out the reason.
 
-=item 1
+=item C<1>
 
 The operation succeeded.
 
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_shutdown.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_shutdown.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_shutdown.pod.manfix	2004-11-14 14:55:16.000000000 +0100
+++ openssl-fips-0.9.8e/doc/ssl/SSL_shutdown.pod	2013-07-17 16:56:04.569658682 +0200
@@ -92,12 +92,12 @@ The following return values can occur:
 
 =over 4
 
-=item 1
+=item C<1>
 
 The shutdown was successfully completed. The "close notify" alert was sent
 and the peer's "close notify" alert was received.
 
-=item 0
+=item C<0>
 
 The shutdown is not yet finished. Call SSL_shutdown() for a second time,
 if a bidirectional shutdown shall be performed.
diff -up openssl-fips-0.9.8e/doc/ssl/SSL_write.pod.manfix openssl-fips-0.9.8e/doc/ssl/SSL_write.pod
--- openssl-fips-0.9.8e/doc/ssl/SSL_write.pod.manfix	2002-07-19 13:53:54.000000000 +0200
+++ openssl-fips-0.9.8e/doc/ssl/SSL_write.pod	2013-07-17 16:53:45.854069737 +0200
@@ -79,7 +79,7 @@ The following return values can occur:
 The write operation was successful, the return value is the number of
 bytes actually written to the TLS/SSL connection.
 
-=item 0
+=item C<0>
 
 The write operation was not successful. Probably the underlying connection
 was closed. Call SSL_get_error() with the return value B<ret> to find out,