diff --git a/src/cf/linux-kernel-header.m4 b/src/cf/linux-kernel-header.m4
index c7f989e0f0..8507eaaabf 100644
--- a/src/cf/linux-kernel-header.m4
+++ b/src/cf/linux-kernel-header.m4
@@ -9,4 +9,5 @@ AC_CHECK_LINUX_HEADER([semaphore.h])
 AC_CHECK_LINUX_HEADER([seq_file.h])
 AC_CHECK_LINUX_HEADER([sched/signal.h])
 AC_CHECK_LINUX_HEADER([uaccess.h])
+AC_CHECK_LINUX_HEADER([stdarg.h])
 ])
diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index 6a640e678c..8d8a330a6f 100644
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -140,7 +140,11 @@ struct coda_inode_info {
 # if defined(AFS_FBSD_ENV)
 #  include "machine/stdarg.h"
 # else
-#  include "stdarg.h"
+#  if defined(HAVE_LINUX_STDARG_H)
+#   include "linux/stdarg.h"
+#  else
+#   include "stdarg.h"
+#  endif
 # endif
 #endif
 #ifdef KERNEL