diff --git a/lib/Makefile b/lib/Makefile
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -215,6 +215,9 @@
 .if ${MACHINE_ARCH} != "powerpc"
 SUBDIR.${MK_OPENMP}+=	libomp
 .endif
+.if !defined(COMPAT_32BIT)
+SUBDIR.${MK_OPENSSH}+=	libcbor
+.endif
 SUBDIR.${MK_OPENSSL}+=	libmp
 SUBDIR.${MK_PF}+=	libpfctl
 SUBDIR.${MK_PMC}+=	libpmc libpmcstat
diff --git a/lib/libcbor/Makefile b/lib/libcbor/Makefile
new file mode 100644
--- /dev/null
+++ b/lib/libcbor/Makefile
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+PACKAGE=ssh
+LIB=	cbor
+PRIVATELIB=
+
+DIST=${SRCTOP}/contrib/libcbor
+.PATH:	${DIST}/src
+
+SRCS=	cbor.c
+SRCS+=	cbor/arrays.c
+SRCS+=	cbor/bytestrings.c
+SRCS+=	cbor/callbacks.c
+SRCS+=	cbor/common.c
+SRCS+=	cbor/encoding.c
+SRCS+=	cbor/floats_ctrls.c
+SRCS+=	cbor/ints.c
+SRCS+=	cbor/maps.c
+SRCS+=	cbor/serialization.c
+SRCS+=	cbor/streaming.c
+SRCS+=	cbor/strings.c
+SRCS+=	cbor/tags.c
+SRCS+=	cbor/internal/builder_callbacks.c
+SRCS+=	cbor/internal/encoders.c
+SRCS+=	cbor/internal/loaders.c
+SRCS+=	cbor/internal/memory_utils.c
+SRCS+=	cbor/internal/stack.c
+SRCS+=	cbor/internal/unicode.c
+
+CFLAGS+= -I${DIST}/src -I${.CURDIR}
+
+WARNS?=	2
+MAN=
+
+.include <bsd.lib.mk>
diff --git a/lib/libcbor/cbor/cbor_export.h b/lib/libcbor/cbor/cbor_export.h
new file mode 100644
--- /dev/null
+++ b/lib/libcbor/cbor/cbor_export.h
@@ -0,0 +1,42 @@
+
+#ifndef CBOR_EXPORT_H
+#define CBOR_EXPORT_H
+
+#ifdef CBOR_STATIC_DEFINE
+#  define CBOR_EXPORT
+#  define CBOR_NO_EXPORT
+#else
+#  ifndef CBOR_EXPORT
+#    ifdef cbor_EXPORTS
+        /* We are building this library */
+#      define CBOR_EXPORT __attribute__((visibility("default")))
+#    else
+        /* We are using this library */
+#      define CBOR_EXPORT __attribute__((visibility("default")))
+#    endif
+#  endif
+
+#  ifndef CBOR_NO_EXPORT
+#    define CBOR_NO_EXPORT __attribute__((visibility("hidden")))
+#  endif
+#endif
+
+#ifndef CBOR_DEPRECATED
+#  define CBOR_DEPRECATED __attribute__ ((__deprecated__))
+#endif
+
+#ifndef CBOR_DEPRECATED_EXPORT
+#  define CBOR_DEPRECATED_EXPORT CBOR_EXPORT CBOR_DEPRECATED
+#endif
+
+#ifndef CBOR_DEPRECATED_NO_EXPORT
+#  define CBOR_DEPRECATED_NO_EXPORT CBOR_NO_EXPORT CBOR_DEPRECATED
+#endif
+
+#if 0 /* DEFINE_NO_DEPRECATED */
+#  ifndef CBOR_NO_DEPRECATED
+#    define CBOR_NO_DEPRECATED
+#  endif
+#endif
+
+#endif /* CBOR_EXPORT_H */
diff --git a/lib/libcbor/cbor/configuration.h b/lib/libcbor/cbor/configuration.h
new file mode 100644
--- /dev/null
+++ b/lib/libcbor/cbor/configuration.h
@@ -0,0 +1,16 @@
+#ifndef LIBCBOR_CONFIGURATION_H
+#define LIBCBOR_CONFIGURATION_H
+
+#define CBOR_MAJOR_VERSION 0
+#define CBOR_MINOR_VERSION 8
+#define CBOR_PATCH_VERSION 0
+
+#define CBOR_CUSTOM_ALLOC 0
+#define CBOR_BUFFER_GROWTH 2
+#define CBOR_MAX_STACK_SIZE 2048
+#define CBOR_PRETTY_PRINTER 1
+
+#define CBOR_RESTRICT_SPECIFIER restrict
+#define CBOR_INLINE_SPECIFIER 
+
+#endif //LIBCBOR_CONFIGURATION_H
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -17,6 +17,7 @@
 		atf_cxx \
 		auditd \
 		bsdstat \
+		cbor \
 		devdctl \
 		event1 \
 		gmock \
@@ -687,6 +688,7 @@
 LIBCAP_PWDDIR=	${OBJTOP}/lib/libcasper/services/cap_pwd
 LIBCAP_SYSCTLDIR=	${OBJTOP}/lib/libcasper/services/cap_sysctl
 LIBCAP_SYSLOGDIR=	${OBJTOP}/lib/libcasper/services/cap_syslog
+LIBCBORDIR=	${OBJTOP}/lib/libcbor
 LIBBSDXMLDIR=	${OBJTOP}/lib/libexpat
 LIBKVMDIR=	${OBJTOP}/lib/libkvm
 LIBPTHREADDIR=	${OBJTOP}/lib/libthr
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -7119,6 +7119,9 @@
 OLD_FILES+=usr/bin/ssh-copy-id
 OLD_FILES+=usr/bin/ssh-keygen
 OLD_FILES+=usr/bin/ssh-keyscan
+OLD_FILES+=usr/lib/libprivatecbor.a
+OLD_FILES+=usr/lib/libprivatecbor.so
+OLD_LIBS+=usr/lib/libprivatecbor.so.5
 OLD_FILES+=usr/lib/pam_ssh.so
 OLD_LIBS+=usr/lib/pam_ssh.so.6
 OLD_FILES+=usr/lib/libprivatessh.a