diff --git a/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h b/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h
index e1d44b31f76d..e71afb70480e 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h
@@ -37,7 +37,7 @@
 #define	BCM2835_VCBUS_IO_BASE		0x7E000000
 #define	BCM2835_VCBUS_SDRAM_UNCACHED	0xC0000000
 
-#ifdef SOC_BCM2836
+#if defined(SOC_BCM2836) || defined(SOC_BCM2837)
 #define	BCM2835_ARM_IO_BASE		0x3f000000
 #define	BCM2835_VCBUS_SDRAM_BASE	BCM2835_VCBUS_SDRAM_UNCACHED
 #else
diff --git a/sys/arm64/broadcom/bcm2837/files.bcm2837 b/sys/arm64/broadcom/bcm2837/files.bcm2837
new file mode 100644
index 000000000000..0af4e9883151
--- /dev/null
+++ b/sys/arm64/broadcom/bcm2837/files.bcm2837
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+arm/broadcom/bcm2835/bcm2836.c		standard
+kern/kern_clocksource.c			standard
diff --git a/sys/arm64/conf/RPI3 b/sys/arm64/conf/RPI3
new file mode 100644
index 000000000000..7b0be5e736a5
--- /dev/null
+++ b/sys/arm64/conf/RPI3
@@ -0,0 +1,160 @@
+#
+#
+# RPI3 -- Custom configuration for the Raspberry Pi 3 
+#
+# For more information on this file, please read the config(5) manual page,
+# and/or the handbook section on Kernel Configuration Files:
+#
+#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ../../conf/NOTES and NOTES files.
+# If you are in doubt as to the purpose or necessity of a line, check first
+# in NOTES.
+#
+# $FreeBSD$
+
+cpu		ARM64
+ident		RPI3
+
+files	"../../arm/broadcom/bcm2835/files.bcm283x"
+files	"../broadcom/bcm2837/files.bcm2837"
+
+makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
+#makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
+
+options 	SCHED_ULE		# ULE scheduler
+options 	PREEMPTION		# Enable kernel thread preemption
+options 	INET			# InterNETworking
+options 	INET6			# IPv6 communications protocols
+options 	IPSEC			# IP (v4/v6) security
+options 	TCP_HHOOK		# hhook(9) framework for TCP
+options 	TCP_OFFLOAD		# TCP offload
+options 	SCTP			# Stream Control Transmission Protocol
+options 	FFS			# Berkeley Fast Filesystem
+options 	SOFTUPDATES		# Enable FFS soft updates support
+options 	UFS_ACL			# Support for access control lists
+options 	UFS_DIRHASH		# Improve performance on big directories
+options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
+options 	QUOTA			# Enable disk quotas for UFS
+options 	MD_ROOT			# MD is a potential root device
+options 	NFSCL			# Network Filesystem Client
+options 	NFSD			# Network Filesystem Server
+options 	NFSLOCKD		# Network Lock Manager
+options 	NFS_ROOT		# NFS usable as /, requires NFSCL
+options 	MSDOSFS			# MSDOS Filesystem
+options 	CD9660			# ISO 9660 Filesystem
+options 	PROCFS			# Process filesystem (requires PSEUDOFS)
+options 	PSEUDOFS		# Pseudo-filesystem framework
+options 	GEOM_PART_GPT		# GUID Partition Tables.
+options 	GEOM_RAID		# Soft RAID functionality.
+options 	GEOM_LABEL		# Provides labelization
+options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
+options 	KTRACE			# ktrace(1) support
+options 	STACK			# stack(9) support
+options 	SYSVSHM			# SYSV-style shared memory
+options 	SYSVMSG			# SYSV-style message queues
+options 	SYSVSEM			# SYSV-style semaphores
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
+options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
+options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
+options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
+options 	AUDIT			# Security event auditing
+options 	CAPABILITY_MODE		# Capsicum capability mode
+options 	CAPABILITIES		# Capsicum capabilities
+options 	MAC			# TrustedBSD MAC Framework
+options 	KDTRACE_FRAME		# Ensure frames are compiled in
+options 	KDTRACE_HOOKS		# Kernel DTrace hooks
+options 	VFP			# Floating-point support
+options 	RACCT			# Resource accounting framework
+options 	RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
+options 	RCTL			# Resource limits
+# SMP is not there yet
+# options 	SMP
+options 	INTRNG
+
+# Debugging support.  Always need this:
+options 	KDB			# Enable kernel debugger support.
+options 	KDB_TRACE		# Print a stack trace for a panic.
+# For full debugger support use (turn off in stable branch):
+options 	DDB			# Support DDB.
+#options 	GDB			# Support remote GDB.
+options 	DEADLKRES		# Enable the deadlock resolver
+options 	INVARIANTS		# Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
+options 	WITNESS			# Enable checks to detect deadlocks and cycles
+options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
+options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
+
+options 	SOC_BCM2837
+
+options 	ROOTDEVNAME=\"ufs:mmcsd0s2\"
+
+# SPI
+device		spibus
+device		bcm2835_spi
+
+# MMC/SD/SDIO Card slot support
+device		sdhci
+device		mmc			# mmc/sd bus
+device		mmcsd			# mmc/sd flash cards
+
+# Serial (COM) ports
+device		uart		# Generic UART driver
+device		uart_ns8250	# ns8250-type UART driver
+device		pl011
+
+# USB support
+options 	USB_DEBUG		# enable debug msgs
+device		usb			# USB Bus (required)
+device		dwcotg			# DWC OTG controller
+
+# USB storage support
+device		scbus
+device		da
+device		umass
+
+# USB ethernet support
+device		smcphy
+device		mii
+device		smsc
+
+# Comment following lines for boot console on serial port
+device		vt
+device		kbdmux
+device		ukbd			# Keyboard
+
+# GPIO
+device		gpio
+device		fdt_pinctrl
+device		gpioled
+
+# I2C
+device		iicbus
+device		bcm2835_bsc
+
+# Not ready for ARM64 yet
+# device		vchiq
+# device		sound
+
+# Pseudo devices.
+device		bpf
+device		loop		# Network loopback
+device		random		# Entropy device
+device		ether		# Ethernet support
+device		vlan		# 802.1Q VLAN support
+device		tun		# Packet tunnel.
+device		md		# Memory "disks"
+device		gif		# IPv6 and IPv4 tunneling
+device		firmware	# firmware assist module
+device		psci		# Support for ARM PSCI
+
+options 	FDT
+
+# The crypto framework is required by IPSEC
+device		crypto			# Required by IPSEC
diff --git a/sys/conf/options.arm64 b/sys/conf/options.arm64
index e7f746ea1d55..99395880227e 100644
--- a/sys/conf/options.arm64
+++ b/sys/conf/options.arm64
@@ -9,5 +9,6 @@ VFP				opt_global.h
 
 # SoC Support
 SOC_ALLWINNER_A64		opt_soc.h
+SOC_BCM2837			opt_global.h
 SOC_CAVM_THUNDERX		opt_soc.h
 SOC_HISI_HI6220			opt_soc.h