diff --git a/lib/openpam_get_option.c b/lib/openpam_get_option.c
index 2efde2d..2cdf270 100644
--- a/lib/openpam_get_option.c
+++ b/lib/openpam_get_option.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_get_option.c#7 $
+ * $P4: //depot/projects/openpam/lib/openpam_get_option.c#8 $
  */
 
 #include <sys/param.h>
@@ -73,10 +73,6 @@ openpam_get_option(pam_handle_t *pamh,
 	RETURNS(NULL);
 }
 
-/*
- * NOLIST
- */
-
 /**
  * The =openpam_get_option function returns the value of the specified
  * option in the context of the currently executing service module, or
diff --git a/lib/openpam_log.c b/lib/openpam_log.c
index cb720f3..364b28b 100644
--- a/lib/openpam_log.c
+++ b/lib/openpam_log.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_log.c#19 $
+ * $P4: //depot/projects/openpam/lib/openpam_log.c#20 $
  */
 
 #include <ctype.h>
@@ -129,7 +129,3 @@ openpam_log(int level, const char *fmt, ...)
 }
 
 #endif
-
-/*
- * NOLIST
- */
diff --git a/lib/openpam_nullconv.c b/lib/openpam_nullconv.c
index 94a9936..7c8e403 100644
--- a/lib/openpam_nullconv.c
+++ b/lib/openpam_nullconv.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_nullconv.c#4 $
+ * $P4: //depot/projects/openpam/lib/openpam_nullconv.c#5 $
  */
 
 #include <sys/types.h>
@@ -62,8 +62,6 @@ openpam_nullconv(int n,
 }
 
 /*
- * NOLIST
- *
  * Error codes:
  *
  *	PAM_CONV_ERR
diff --git a/lib/openpam_set_option.c b/lib/openpam_set_option.c
index 7422dc1..3a7bbce 100644
--- a/lib/openpam_set_option.c
+++ b/lib/openpam_set_option.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_set_option.c#8 $
+ * $P4: //depot/projects/openpam/lib/openpam_set_option.c#9 $
  */
 
 #include <sys/param.h>
@@ -105,8 +105,6 @@ openpam_set_option(pam_handle_t *pamh,
 }
 
 /*
- * NOLIST
- *
  * Error codes:
  *
  *	PAM_SYSTEM_ERR
diff --git a/lib/openpam_ttyconv.c b/lib/openpam_ttyconv.c
index 9b07600..0b1057d 100644
--- a/lib/openpam_ttyconv.c
+++ b/lib/openpam_ttyconv.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#16 $
+ * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#17 $
  */
 
 #include <sys/types.h>
@@ -186,8 +186,6 @@ openpam_ttyconv(int n,
 }
 
 /*
- * NOLIST
- *
  * Error codes:
  *
  *	PAM_SYSTEM_ERR
diff --git a/lib/pam_sm_acct_mgmt.c b/lib/pam_sm_acct_mgmt.c
index 8351fca..53d2015 100644
--- a/lib/pam_sm_acct_mgmt.c
+++ b/lib/pam_sm_acct_mgmt.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_sm_acct_mgmt.c#5 $
+ * $P4: //depot/projects/openpam/lib/pam_sm_acct_mgmt.c#6 $
  */
 
 #include <sys/param.h>
@@ -58,8 +58,6 @@ pam_sm_acct_mgmt(pam_handle_t *pamh,
 }
 
 /*
- * NOLIST
- *
  * Error codes:
  *
  *	PAM_SERVICE_ERR
diff --git a/lib/pam_sm_authenticate.c b/lib/pam_sm_authenticate.c
index 50cceef..e1c1285 100644
--- a/lib/pam_sm_authenticate.c
+++ b/lib/pam_sm_authenticate.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_sm_authenticate.c#5 $
+ * $P4: //depot/projects/openpam/lib/pam_sm_authenticate.c#6 $
  */
 
 #include <sys/param.h>
@@ -58,8 +58,6 @@ pam_sm_authenticate(pam_handle_t *pamh,
 }
 
 /*
- * NOLIST
- *
  * Error codes:
  *
  *	PAM_SERVICE_ERR
diff --git a/lib/pam_sm_chauthtok.c b/lib/pam_sm_chauthtok.c
index b4ede72..79caaf9 100644
--- a/lib/pam_sm_chauthtok.c
+++ b/lib/pam_sm_chauthtok.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_sm_chauthtok.c#6 $
+ * $P4: //depot/projects/openpam/lib/pam_sm_chauthtok.c#7 $
  */
 
 #include <sys/param.h>
@@ -58,8 +58,6 @@ pam_sm_chauthtok(pam_handle_t *pamh,
 }
 
 /*
- * NOLIST
- *
  * Error codes:
  *
  *	PAM_SERVICE_ERR
diff --git a/lib/pam_sm_close_session.c b/lib/pam_sm_close_session.c
index e27274f..47d433c 100644
--- a/lib/pam_sm_close_session.c
+++ b/lib/pam_sm_close_session.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_sm_close_session.c#5 $
+ * $P4: //depot/projects/openpam/lib/pam_sm_close_session.c#6 $
  */
 
 #include <sys/param.h>
@@ -58,8 +58,6 @@ pam_sm_close_session(pam_handle_t *pamh,
 }
 
 /*
- * NOLIST
- *
  * Error codes:
  *
  *	PAM_SERVICE_ERR
diff --git a/lib/pam_sm_open_session.c b/lib/pam_sm_open_session.c
index 161344f..5eacc83 100644
--- a/lib/pam_sm_open_session.c
+++ b/lib/pam_sm_open_session.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_sm_open_session.c#5 $
+ * $P4: //depot/projects/openpam/lib/pam_sm_open_session.c#6 $
  */
 
 #include <sys/param.h>
@@ -58,8 +58,6 @@ pam_sm_open_session(pam_handle_t *pamh,
 }
 
 /*
- * NOLIST
- *
  * Error codes:
  *
  *	PAM_SERVICE_ERR
diff --git a/lib/pam_sm_setcred.c b/lib/pam_sm_setcred.c
index 90e571c..5507a37 100644
--- a/lib/pam_sm_setcred.c
+++ b/lib/pam_sm_setcred.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_sm_setcred.c#5 $
+ * $P4: //depot/projects/openpam/lib/pam_sm_setcred.c#6 $
  */
 
 #include <sys/param.h>
@@ -59,8 +59,6 @@ pam_sm_setcred(pam_handle_t *pamh,
 
 
 /*
- * NOLIST
- *
  * Error codes:
  *
  *	PAM_SERVICE_ERR
diff --git a/misc/gendoc.pl b/misc/gendoc.pl
index 9db0067..478af08 100644
--- a/misc/gendoc.pl
+++ b/misc/gendoc.pl
@@ -32,7 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $P4: //depot/projects/openpam/misc/gendoc.pl#20 $
+# $P4: //depot/projects/openpam/misc/gendoc.pl#21 $
 #
 
 use strict;
@@ -274,10 +274,6 @@ sub parse_source($) {
     };
     if ($source =~ m/^ \* NODOC\s*$/m) {
 	$FUNCTIONS{$func}->{'nodoc'} = 1;
-	$FUNCTIONS{$func}->{'nolist'} = 1;
-    }
-    if ($source =~ m/^ \* NOLIST\s*$/m) {
-	$FUNCTIONS{$func}->{'nolist'} = 1;
     }
     if ($source !~ m/^ \* XSSO \d/m) {
 	$FUNCTIONS{$func}->{'openpam'} = 1;