diff --git a/arch/README b/arch/README
index 1442c41..9a76577 100644
--- a/arch/README
+++ b/arch/README
@@ -4,6 +4,9 @@
 expects to find in the system library -- Alpha, for example, needs
 divide subroutines.
 
+The "getenvtest" test program is a very good test for proper crt0.S
+functionality.
+
 
 extern char **environ;
 extern int main(int, char **, char **);
diff --git a/getenvtest.c b/getenvtest.c
index 6aacb5e..5160e68 100644
--- a/getenvtest.c
+++ b/getenvtest.c
@@ -1,10 +1,15 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
 
-int main(int argc, char *argv[])
+int main(int argc, char *argv[], char *envp[])
 {
   int i;
 
+  /* Verify envp == environ */
+  printf("Verifying envp == environ... %s\n",
+	 (envp == environ) ? "ok" : "ERROR");
+
   /* Test argc/argv */
   for ( i = 0 ; i < argc ; i++ ) {
     printf("argv[%2d] = %s\n", i, argv[i]);
diff --git a/klibc/arch/README b/klibc/arch/README
index 1442c41..9a76577 100644
--- a/klibc/arch/README
+++ b/klibc/arch/README
@@ -4,6 +4,9 @@
 expects to find in the system library -- Alpha, for example, needs
 divide subroutines.
 
+The "getenvtest" test program is a very good test for proper crt0.S
+functionality.
+
 
 extern char **environ;
 extern int main(int, char **, char **);
diff --git a/klibc/getenvtest.c b/klibc/getenvtest.c
index 6aacb5e..5160e68 100644
--- a/klibc/getenvtest.c
+++ b/klibc/getenvtest.c
@@ -1,10 +1,15 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
 
-int main(int argc, char *argv[])
+int main(int argc, char *argv[], char *envp[])
 {
   int i;
 
+  /* Verify envp == environ */
+  printf("Verifying envp == environ... %s\n",
+	 (envp == environ) ? "ok" : "ERROR");
+
   /* Test argc/argv */
   for ( i = 0 ; i < argc ; i++ ) {
     printf("argv[%2d] = %s\n", i, argv[i]);