diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h
index ef298cbfbd..e6882860d6 100644
--- a/src/config/afs_sysnames.h
+++ b/src/config/afs_sysnames.h
@@ -378,6 +378,8 @@
 #define SYS_NAME_ID_amd64_fbsd_123     3063
 #define SYS_NAME_ID_amd64_fbsd_130     3070
 #define SYS_NAME_ID_amd64_fbsd_131     3071
+#define SYS_NAME_ID_amd64_fbsd_140     3080
+#define SYS_NAME_ID_amd64_fbsd_141     3081
 
 #define SYS_NAME_ID_amd64_w2k           3400
 
diff --git a/src/config/param.amd64_fbsd_140.h b/src/config/param.amd64_fbsd_140.h
new file mode 100644
index 0000000000..b76bc04ea7
--- /dev/null
+++ b/src/config/param.amd64_fbsd_140.h
@@ -0,0 +1,64 @@
+#ifndef	AFS_PARAM_H
+#define	AFS_PARAM_H
+
+/* Machine / Operating system information */
+#define SYS_NAME	"amd64_fbsd_140"
+#define SYS_NAME_ID	SYS_NAME_ID_amd64_fbsd_140
+
+#define AFS_64BITPOINTER_ENV 1
+#define AFS_64BITUSERPOINTER_ENV 1
+
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
+#define AFS_FBSD101_ENV 1
+#define AFS_FBSD102_ENV 1
+#define AFS_FBSD103_ENV 1
+#define AFS_FBSD104_ENV 1
+#define AFS_FBSD110_ENV 1
+#define AFS_FBSD111_ENV 1
+#define AFS_FBSD120_ENV 1
+#define AFS_FBSD121_ENV 1
+#define AFS_FBSD122_ENV 1
+#define AFS_FBSD123_ENV 1
+#define AFS_FBSD130_ENV 1
+#define AFS_FBSD131_ENV 1
+#define AFS_FBSD140_ENV 1
+
+#define AFS_X86_FBSD101_ENV 1
+#define AFS_X86_FBSD102_ENV 1
+#define AFS_X86_FBSD103_ENV 1
+#define AFS_X86_FBSD104_ENV 1
+#define AFS_X86_FBSD110_ENV 1
+#define AFS_X86_FBSD111_ENV 1
+#define AFS_X86_FBSD120_ENV 1
+#define AFS_X86_FBSD121_ENV 1
+#define AFS_X86_FBSD122_ENV 1
+#define AFS_X86_FBSD123_ENV 1
+#define AFS_X86_FBSD130_ENV 1
+#define AFS_X86_FBSD131_ENV 1
+#define AFS_X86_FBSD140_ENV 1
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#define AFS_USR_FBSD101_ENV 1
+#define AFS_USR_FBSD102_ENV 1
+#define AFS_USR_FBSD103_ENV 1
+#define AFS_USR_FBSD104_ENV 1
+#define AFS_USR_FBSD110_ENV 1
+#define AFS_USR_FBSD111_ENV 1
+#define AFS_USR_FBSD120_ENV 1
+#define AFS_USR_FBSD121_ENV 1
+#define AFS_USR_FBSD122_ENV 1
+#define AFS_USR_FBSD123_ENV 1
+#define AFS_USR_FBSD130_ENV 1
+#define AFS_USR_FBSD131_ENV 1
+#define AFS_USR_FBSD140_ENV 1
+
+#endif /* !defined(UKERNEL) */
+
+#define USE_UCONTEXT
+
+#endif /* AFS_PARAM_H */
diff --git a/src/config/param.amd64_fbsd_141.h b/src/config/param.amd64_fbsd_141.h
new file mode 100644
index 0000000000..fde5a2a46a
--- /dev/null
+++ b/src/config/param.amd64_fbsd_141.h
@@ -0,0 +1,67 @@
+#ifndef	AFS_PARAM_H
+#define	AFS_PARAM_H
+
+/* Machine / Operating system information */
+#define SYS_NAME	"amd64_fbsd_141"
+#define SYS_NAME_ID	SYS_NAME_ID_amd64_fbsd_141
+
+#define AFS_64BITPOINTER_ENV 1
+#define AFS_64BITUSERPOINTER_ENV 1
+
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
+#define AFS_FBSD101_ENV 1
+#define AFS_FBSD102_ENV 1
+#define AFS_FBSD103_ENV 1
+#define AFS_FBSD104_ENV 1
+#define AFS_FBSD110_ENV 1
+#define AFS_FBSD111_ENV 1
+#define AFS_FBSD120_ENV 1
+#define AFS_FBSD121_ENV 1
+#define AFS_FBSD122_ENV 1
+#define AFS_FBSD123_ENV 1
+#define AFS_FBSD130_ENV 1
+#define AFS_FBSD131_ENV 1
+#define AFS_FBSD140_ENV 1
+#define AFS_FBSD141_ENV 1
+
+#define AFS_X86_FBSD101_ENV 1
+#define AFS_X86_FBSD102_ENV 1
+#define AFS_X86_FBSD103_ENV 1
+#define AFS_X86_FBSD104_ENV 1
+#define AFS_X86_FBSD110_ENV 1
+#define AFS_X86_FBSD111_ENV 1
+#define AFS_X86_FBSD120_ENV 1
+#define AFS_X86_FBSD121_ENV 1
+#define AFS_X86_FBSD122_ENV 1
+#define AFS_X86_FBSD123_ENV 1
+#define AFS_X86_FBSD130_ENV 1
+#define AFS_X86_FBSD131_ENV 1
+#define AFS_X86_FBSD140_ENV 1
+#define AFS_X86_FBSD141_ENV 1
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#define AFS_USR_FBSD101_ENV 1
+#define AFS_USR_FBSD102_ENV 1
+#define AFS_USR_FBSD103_ENV 1
+#define AFS_USR_FBSD104_ENV 1
+#define AFS_USR_FBSD110_ENV 1
+#define AFS_USR_FBSD111_ENV 1
+#define AFS_USR_FBSD120_ENV 1
+#define AFS_USR_FBSD121_ENV 1
+#define AFS_USR_FBSD122_ENV 1
+#define AFS_USR_FBSD123_ENV 1
+#define AFS_USR_FBSD130_ENV 1
+#define AFS_USR_FBSD131_ENV 1
+#define AFS_USR_FBSD140_ENV 1
+#define AFS_USR_FBSD141_ENV 1
+
+#endif /* !defined(UKERNEL) */
+
+#define USE_UCONTEXT
+
+#endif /* AFS_PARAM_H */