diff --git a/src/afs/OBSD/osi_misc.c b/src/afs/OBSD/osi_misc.c
index 138f8e0c42..8bbcf559ee 100644
--- a/src/afs/OBSD/osi_misc.c
+++ b/src/afs/OBSD/osi_misc.c
@@ -67,7 +67,11 @@ RCSID
 int
 afs_osi_suser(void *credp)
 {
+#ifdef AFS_OBSD35_ENV
+    return (suser_ucred((struct ucred *)credp) ? 0 : 1);
+#else
     return (suser((struct ucred *)credp, &curproc->p_acflag) ? 0 : 1);
+#endif
 }
 
 void *
diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h
index 611462e127..eece0582d4 100644
--- a/src/config/afs_sysnames.h
+++ b/src/config/afs_sysnames.h
@@ -188,6 +188,7 @@
 #define SYS_NAME_ID_i386_obsd32		2601
 #define SYS_NAME_ID_i386_obsd33		2602
 #define SYS_NAME_ID_i386_obsd34		2603
+#define SYS_NAME_ID_i386_obsd35		2604
 
 #define SYS_NAME_ID_amd64_linux2        2700
 #define SYS_NAME_ID_amd64_linux22       2701
diff --git a/src/config/param.i386_obsd35.h b/src/config/param.i386_obsd35.h
new file mode 100644
index 0000000000..46a027dae7
--- /dev/null
+++ b/src/config/param.i386_obsd35.h
@@ -0,0 +1,62 @@
+/*
+ * Jim Rees, University of Michigan CITI
+ */
+
+#ifndef	AFS_PARAM_H
+#define	AFS_PARAM_H
+
+#ifndef IGNORE_STDS_H
+#include <sys/param.h>
+#endif
+
+#define SYS_NAME		"i386_obsd35"
+#define SYS_NAME_ID		SYS_NAME_ID_i386_obsd35
+
+#define AFS_XBSD_ENV		1	/* {Free,Open,Net}BSD */
+#define AFS_X86_XBSD_ENV	1
+
+#define AFS_NAMEI_ENV		1	/* User space interface to file system */
+#define AFS_64BIT_ENV		1
+#define AFS_64BIT_IOPS_ENV	1	/* Needed for NAMEI */
+#define AFS_OBSD_ENV		1
+#define AFS_OBSD34_ENV		1
+#define AFS_OBSD35_ENV		1
+#define AFS_NONFSTRANS		1
+#define AFS_VM_RDWR_ENV		1
+#define AFS_VFS_ENV		1
+#define AFS_VFSINCL_ENV		1
+
+#define FTRUNC O_TRUNC
+
+#define AFS_SYSCALL		208
+#define AFS_MOUNT_AFS		"afs"
+
+#define RXK_LISTENER_ENV	1
+#define AFS_GCPAGS	        0	/* if nonzero, garbage collect PAGs */
+#define AFS_USE_GETTIMEOFDAY    1	/* use gettimeofday to implement rx clock */
+
+#define AFSLITTLE_ENDIAN	1
+
+#ifndef IGNORE_STDS_H
+#include <afs/afs_sysnames.h>
+#endif
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef _KERNEL
+#define AFS_GLOBAL_SUNLOCK	1
+#define	AFS_SHORTGID		0	/* are group id's short? */
+
+#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
+enum vcexcl { NONEXCL, EXCL };
+
+#ifndef MIN
+#define MIN(A,B) ((A) < (B) ? (A) : (B))
+#endif
+#ifndef MAX
+#define MAX(A,B) ((A) > (B) ? (A) : (B))
+#endif
+
+#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
+#endif /* _KERNEL */
+
+#endif /* AFS_PARAM_H */