diff --git a/lib/kafs/afssys.c b/lib/kafs/afssys.c
index 5b1660e1e..2105dd81e 100644
--- a/lib/kafs/afssys.c
+++ b/lib/kafs/afssys.c
@@ -336,7 +336,7 @@ k_afsklog(char *cell, char *krealm)
       parms.in_size = t - buf;
       parms.out = 0;
       parms.out_size = 0;
-      (void) k_pioctl(0, VIOCSETTOK, &parms, 0);
+      k_pioctl(0, VIOCSETTOK, &parms, 0);
     }
   return k_errno;
 }
@@ -345,8 +345,9 @@ k_afsklog(char *cell, char *krealm)
 #define SINGLE_ENTRY_POINT	1
 #define MULTIPLE_ENTRY_POINT	2
 #define SINGLE_ENTRY_POINT2	3
-#define AIX_ENTRY_POINTS	4
-#define UNKNOWN_ENTRY_POINT	5
+#define SINGLE_ENTRY_POINT3	4
+#define AIX_ENTRY_POINTS	5
+#define UNKNOWN_ENTRY_POINT	6
 static int afs_entry_point = UNKNOWN_ENTRY_POINT;
 
 int
@@ -374,6 +375,12 @@ k_pioctl(char *a_path,
 		   a_path, o_opcode, a_paramsP, a_followSymlinks);
 #endif
 
+#ifdef AFS_SYSCALL3
+  if (afs_entry_point == SINGLE_ENTRY_POINT3)
+    return syscall(AFS_SYSCALL3, AFSCALL_PIOCTL,
+		   a_path, o_opcode, a_paramsP, a_followSymlinks);
+#endif
+
 #ifdef _AIX
   if (afs_entry_point == AIX_ENTRY_POINTS)
       return Pioctl(a_path, o_opcode, a_paramsP, a_followSymlinks);
@@ -507,6 +514,19 @@ k_hasafs(void)
     }
 #endif /* AFS_SYSCALL */
 
+#ifdef AFS_SYSCALL3
+  if (setjmp(catch_SIGSYS) == 0)
+    {
+      syscall(AFS_SYSCALL3, AFSCALL_PIOCTL,
+	      0, VIOCSETTOK, &parms, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+      if (errno == EINVAL)
+	{
+	  afs_entry_point = SINGLE_ENTRY_POINT3;
+	  goto done;
+	}
+    }
+#endif /* AFS_SYSCALL */
+
 #ifdef _AIX
   aix_setup();
   if(Pioctl != NULL && Setpag != NULL){
@@ -517,7 +537,7 @@ k_hasafs(void)
 
  done:
 #ifdef SIGSYS
-  (void) signal(SIGSYS, saved_func);
+  signal(SIGSYS, saved_func);
 #endif
 #endif /* NO_AFS */
   errno = saved_errno;
diff --git a/lib/kafs/afssysdefs.h b/lib/kafs/afssysdefs.h
index e9d1da83d..b1194c305 100644
--- a/lib/kafs/afssysdefs.h
+++ b/lib/kafs/afssysdefs.h
@@ -45,6 +45,5 @@
 #endif
 
 #ifdef SYS_afs_syscall
-#undef  AFS_SYSCALL
-#define AFS_SYSCALL	SYS_afs_syscall
+#define AFS_SYSCALL3	SYS_afs_syscall
 #endif