diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index 55421da..f4bf934 100644
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-04 Hasso Tepper <hasso@estpak.ee>
+
+	* vtysh.c: Remove using PAGER.
+
 2004-01-15 Paul Jakma <paul@dishone.st>
 
 	* vtysh_config.c: Fix up strlen to use correct string.
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 36b7c58..c92c6c4 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -350,8 +350,6 @@
 {
   vtysh_pager_name = getenv ("VTYSH_PAGER");
   if (! vtysh_pager_name)
-    vtysh_pager_name = getenv ("PAGER");
-  if (! vtysh_pager_name)
     vtysh_pager_name = "more";
 }
 
@@ -1465,13 +1463,13 @@
       switch (argc)
 	{
 	case 0:
-	  ret = execlp (command, command, NULL);
+	  ret = execlp (command, command, (const char *)NULL);
 	  break;
 	case 1:
-	  ret = execlp (command, command, arg1, NULL);
+	  ret = execlp (command, command, arg1, (const char *)NULL);
 	  break;
 	case 2:
-	  ret = execlp (command, command, arg1, arg2, NULL);
+	  ret = execlp (command, command, arg1, arg2, (const char *)NULL);
 	  break;
 	}