diff --git a/man2/intro.2 b/man2/intro.2
index d32ef3181..5cfb04701 100644
--- a/man2/intro.2
+++ b/man2/intro.2
@@ -114,7 +114,7 @@ main(void)
            s_info.sharedram, s_info.bufferram,
            s_info.totalswap, s_info.freeswap,
            s_info.procs);
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .SS "Sample Output"
diff --git a/man2/select.2 b/man2/select.2
index 00dbdc531..c844d6076 100644
--- a/man2/select.2
+++ b/man2/select.2
@@ -341,7 +341,7 @@ main(void)
     else
         printf("No data within five seconds.\\n");
 
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .SH "CONFORMING TO"
diff --git a/man2/sysctl.2 b/man2/sysctl.2
index 7a27d4c2e..0fa4771be 100644
--- a/man2/sysctl.2
+++ b/man2/sysctl.2
@@ -98,7 +98,7 @@ main(void)
         perror("sysctl");
     else
         printf("This machine is running %*s\en", osnamelth, osname);
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .SH "RETURN VALUE"
diff --git a/man3/bsearch.3 b/man3/bsearch.3
index 1243e2a67..9742ba56f 100644
--- a/man3/bsearch.3
+++ b/man3/bsearch.3
@@ -108,7 +108,7 @@ main(int argc, char **argv)
         else
             printf("%s: month #%d\en", res->name, res->nr);
     }
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .\" this example referred to in qsort.3
diff --git a/man3/dlopen.3 b/man3/dlopen.3
index c9ba55285..3bedbf514 100644
--- a/man3/dlopen.3
+++ b/man3/dlopen.3
@@ -391,7 +391,7 @@ main(int argc, char **argv)
 
     printf("%f\en", (*cosine)(2.0));
     dlclose(handle);
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .if t .ft P
 .fi
diff --git a/man3/envz_add.3 b/man3/envz_add.3
index c350eeb17..6a4c5f75d 100644
--- a/man3/envz_add.3
+++ b/man3/envz_add.3
@@ -132,7 +132,7 @@ main(int argc, char *argv[], char *envp[])
     printf("%s\en", str);
     str = envz_get(*envp, e_len, "HOME");
     printf("%s\en", str);
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .SH "CONFORMING TO"
diff --git a/man3/fmtmsg.3 b/man3/fmtmsg.3
index 119beb8fe..138804145 100644
--- a/man3/fmtmsg.3
+++ b/man3/fmtmsg.3
@@ -260,7 +260,7 @@ main(void)
     default:
         printf("Unknown error from fmtmsg()\en");
     }
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .PP
diff --git a/man3/getgrent_r.3 b/man3/getgrent_r.3
index 9b86c24b7..a7dcad7dd 100644
--- a/man3/getgrent_r.3
+++ b/man3/getgrent_r.3
@@ -128,7 +128,7 @@ main(void)
         printf("\en");
     }
     endgrent();
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .\" perhaps add error checking - should use strerror_r
diff --git a/man3/getgrouplist.3 b/man3/getgrouplist.3
index 3b4a4a23a..0778f6016 100644
--- a/man3/getgrouplist.3
+++ b/man3/getgrouplist.3
@@ -62,7 +62,7 @@ main(void)
     struct passwd *pw = getpwnam(user);
 
     if (pw == NULL)
-        return 0;
+        exit(EXIT_SUCCESS);
 
     if (getgrouplist(user, pw->pw_gid, NULL, &ng) < 0) {
         groups = (gid_t *) malloc(ng * sizeof (gid_t));
@@ -72,7 +72,7 @@ main(void)
     for(i = 0; i < ng; i++)
         printf("%d\en", groups[i]);
 
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .SH "SEE ALSO"
diff --git a/man3/getpwent_r.3 b/man3/getpwent_r.3
index 91e9f30fa..6f27c34a6 100644
--- a/man3/getpwent_r.3
+++ b/man3/getpwent_r.3
@@ -125,7 +125,7 @@ main(void)
                pwp->pw_uid, pwp->pw_dir, pwp->pw_shell);
     }
     endpwent();
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .\" perhaps add error checking - should use strerror_r
diff --git a/man3/getutent.3 b/man3/getutent.3
index c37ee8754..1098f0ca4 100644
--- a/man3/getutent.3
+++ b/man3/getutent.3
@@ -182,7 +182,7 @@ main(int argc, char *argv[])
     system("echo after removing entry:;who");
 
     endutent();
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .SH FILES
diff --git a/man3/hsearch.3 b/man3/hsearch.3
index 01c7357bd..fcfe505a3 100644
--- a/man3/hsearch.3
+++ b/man3/hsearch.3
@@ -208,7 +208,7 @@ main(void)
         printf("%9.9s \-> %9.9s:%d\\n", e.key,
                ep ? ep\->key : "NULL", ep ? (int)(ep->data) : 0);
     }
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .SH "SEE ALSO"
diff --git a/man3/rtime.3 b/man3/rtime.3
index 79cc26d91..841a932c3 100644
--- a/man3/rtime.3
+++ b/man3/rtime.3
@@ -90,7 +90,7 @@ main(void)
     else
         printf("%s\\n", ctime((time_t *) &time1.tv_sec));
 
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .SH "NOTES"
diff --git a/man3/strptime.3 b/man3/strptime.3
index adf090049..5f7e5cc24 100644
--- a/man3/strptime.3
+++ b/man3/strptime.3
@@ -292,7 +292,7 @@ main(void)
     strptime("2001-11-12 18:31:01", "%Y-%m-%d %H:%M:%S", &tm);
     strftime(buf, sizeof(buf), "%d %b %Y %H:%M", &tm);
     puts(buf);
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .SH "GNU EXTENSIONS"
diff --git a/man3/tsearch.3 b/man3/tsearch.3
index e2ae9d23c..aa0d89a3f 100644
--- a/man3/tsearch.3
+++ b/man3/tsearch.3
@@ -244,7 +244,7 @@ main(void)
             exit(EXIT_FAILURE);
     }
     twalk(root, action);
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .SH "CONFORMING TO"
diff --git a/man3/wordexp.3 b/man3/wordexp.3
index c13fad748..110257e42 100644
--- a/man3/wordexp.3
+++ b/man3/wordexp.3
@@ -91,7 +91,7 @@ main(int argc, char **argv)
     for (i=0; i<p.we_wordc; i++)
         printf("%s\en", w[i]);
     wordfree(&p);
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .SH DETAILS
diff --git a/man4/vcs.4 b/man4/vcs.4
index 22abd14ed..80ae2df3e 100644
--- a/man4/vcs.4
+++ b/man4/vcs.4
@@ -101,7 +101,7 @@ main(void)
     attrib ^= 0x10;
     (void) lseek(fd, \-1, 1);
     (void) write(fd, &attrib, 1);
-    return 0;
+    exit(EXIT_SUCCESS);
 }
 .fi
 .SH FILES