diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index db2d3144f90..74975b2fe33 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -20,6 +20,7 @@ SHLIB_LDSCRIPT=	libc++.ldscript
 SRCS+=		algorithm.cpp
 SRCS+=		any.cpp
 SRCS+=		bind.cpp
+SRCS+=		charconv.cpp
 SRCS+=		chrono.cpp
 SRCS+=		condition_variable.cpp
 SRCS+=		debug.cpp
@@ -84,6 +85,7 @@ STD_HEADERS+=	__bsd_locale_defaults.h
 STD_HEADERS+=	__bsd_locale_fallbacks.h
 STD_HEADERS+=	__config
 STD_HEADERS+=	__debug
+STD_HEADERS+=	__errc
 STD_HEADERS+=	__functional_03
 STD_HEADERS+=	__functional_base
 STD_HEADERS+=	__functional_base_03
@@ -91,6 +93,7 @@ STD_HEADERS+=	__hash_table
 STD_HEADERS+=	__libcpp_version
 STD_HEADERS+=	__locale
 STD_HEADERS+=	__mutex_base
+STD_HEADERS+=	__node_handle
 STD_HEADERS+=	__nullptr
 STD_HEADERS+=	__split_buffer
 STD_HEADERS+=	__sso_allocator
@@ -111,6 +114,7 @@ STD_HEADERS+=	cctype
 STD_HEADERS+=	cerrno
 STD_HEADERS+=	cfenv
 STD_HEADERS+=	cfloat
+STD_HEADERS+=	charconv
 STD_HEADERS+=	chrono
 STD_HEADERS+=	cinttypes
 STD_HEADERS+=	ciso646
@@ -118,6 +122,7 @@ STD_HEADERS+=	climits
 STD_HEADERS+=	clocale
 STD_HEADERS+=	cmath
 STD_HEADERS+=	codecvt
+STD_HEADERS+=	compare
 STD_HEADERS+=	complex
 STD_HEADERS+=	complex.h
 STD_HEADERS+=	condition_variable
@@ -138,6 +143,7 @@ STD_HEADERS+=	cwctype
 STD_HEADERS+=	deque
 STD_HEADERS+=	errno.h
 STD_HEADERS+=	exception
+STD_HEADERS+=	filesystem
 STD_HEADERS+=	float.h
 STD_HEADERS+=	forward_list
 STD_HEADERS+=	fstream
@@ -172,6 +178,7 @@ STD_HEADERS+=	scoped_allocator
 STD_HEADERS+=	set
 STD_HEADERS+=	setjmp.h
 STD_HEADERS+=	shared_mutex
+STD_HEADERS+=	span
 STD_HEADERS+=	sstream
 STD_HEADERS+=	stack
 STD_HEADERS+=	stdbool.h
@@ -198,6 +205,7 @@ STD_HEADERS+=	utility
 STD_HEADERS+=	valarray
 STD_HEADERS+=	variant
 STD_HEADERS+=	vector
+STD_HEADERS+=	version
 STD_HEADERS+=	wchar.h
 STD_HEADERS+=	wctype.h
 
@@ -236,6 +244,7 @@ EXP_HEADERS+=	propagate_const
 EXP_HEADERS+=	ratio
 EXP_HEADERS+=	regex
 EXP_HEADERS+=	set
+EXP_HEADERS+=	simd
 EXP_HEADERS+=	string
 EXP_HEADERS+=	string_view
 EXP_HEADERS+=	system_error
diff --git a/lib/libc++experimental/Makefile b/lib/libc++experimental/Makefile
index e2563cc5cd1..8d1e4b58bbe 100644
--- a/lib/libc++experimental/Makefile
+++ b/lib/libc++experimental/Makefile
@@ -11,9 +11,6 @@ MK_PROFILE=	no
 
 .PATH:		${SRCDIR}/src/experimental
 
-SRCS+=		filesystem/directory_iterator.cpp
-SRCS+=		filesystem/operations.cpp
-SRCS+=		filesystem/path.cpp
 SRCS+=		memory_resource.cpp
 
 WARNS?=		0
diff --git a/lib/libc++fs/Makefile b/lib/libc++fs/Makefile
new file mode 100644
index 00000000000..a89c5d6821d
--- /dev/null
+++ b/lib/libc++fs/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+PACKAGE=	clibs
+SRCDIR=		${SRCTOP}/contrib/libc++
+
+LIB=		c++fs
+NO_PIC=
+MK_PROFILE=	no
+
+.PATH:		${SRCDIR}/src/filesystem
+
+SRCS+=		directory_iterator.cpp
+SRCS+=		int128_builtins.cpp
+SRCS+=		operations.cpp
+
+WARNS?=		0
+CXXFLAGS+=	${PICFLAG}
+CXXFLAGS+=	-isystem ${SRCDIR}/include
+CXXFLAGS+=	-nostdinc++
+CXXFLAGS+=	-nostdlib
+CXXFLAGS+=	-D_LIBCPP_BUILDING_LIBRARY
+CXXFLAGS+=	-DLIBCXXRT
+.if empty(CXXFLAGS:M-std=*)
+CXXFLAGS+=	-std=c++14
+.endif
+
+.include <bsd.lib.mk>
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 97ab5ad1d05..f32545f67c3 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -4006,6 +4006,7 @@ OLD_LIBS+=lib/libcxxrt.so.1
 OLD_FILES+=usr/lib/libc++.a
 OLD_FILES+=usr/lib/libc++_p.a
 OLD_FILES+=usr/lib/libc++experimental.a
+OLD_FILES+=usr/lib/libc++fs.a
 OLD_FILES+=usr/lib/libc++.so
 OLD_LIBS+=usr/lib/libc++.so.1
 OLD_FILES+=usr/lib/libcxxrt.a
@@ -4016,6 +4017,7 @@ OLD_FILES+=usr/include/c++/v1/__bsd_locale_defaults.h
 OLD_FILES+=usr/include/c++/v1/__bsd_locale_fallbacks.h
 OLD_FILES+=usr/include/c++/v1/__config
 OLD_FILES+=usr/include/c++/v1/__debug
+OLD_FILES+=usr/include/c++/v1/__errc
 OLD_FILES+=usr/include/c++/v1/__functional_03
 OLD_FILES+=usr/include/c++/v1/__functional_base
 OLD_FILES+=usr/include/c++/v1/__functional_base_03
@@ -4023,6 +4025,7 @@ OLD_FILES+=usr/include/c++/v1/__hash_table
 OLD_FILES+=usr/include/c++/v1/__libcpp_version
 OLD_FILES+=usr/include/c++/v1/__locale
 OLD_FILES+=usr/include/c++/v1/__mutex_base
+OLD_FILES+=usr/include/c++/v1/__node_handle
 OLD_FILES+=usr/include/c++/v1/__nullptr
 OLD_FILES+=usr/include/c++/v1/__split_buffer
 OLD_FILES+=usr/include/c++/v1/__sso_allocator
@@ -4043,6 +4046,7 @@ OLD_FILES+=usr/include/c++/v1/cctype
 OLD_FILES+=usr/include/c++/v1/cerrno
 OLD_FILES+=usr/include/c++/v1/cfenv
 OLD_FILES+=usr/include/c++/v1/cfloat
+OLD_FILES+=usr/include/c++/v1/charconv
 OLD_FILES+=usr/include/c++/v1/chrono
 OLD_FILES+=usr/include/c++/v1/cinttypes
 OLD_FILES+=usr/include/c++/v1/ciso646
@@ -4050,6 +4054,7 @@ OLD_FILES+=usr/include/c++/v1/climits
 OLD_FILES+=usr/include/c++/v1/clocale
 OLD_FILES+=usr/include/c++/v1/cmath
 OLD_FILES+=usr/include/c++/v1/codecvt
+OLD_FILES+=usr/include/c++/v1/compare
 OLD_FILES+=usr/include/c++/v1/complex
 OLD_FILES+=usr/include/c++/v1/complex.h
 OLD_FILES+=usr/include/c++/v1/condition_variable
@@ -4092,6 +4097,7 @@ OLD_FILES+=usr/include/c++/v1/experimental/propagate_const
 OLD_FILES+=usr/include/c++/v1/experimental/ratio
 OLD_FILES+=usr/include/c++/v1/experimental/regex
 OLD_FILES+=usr/include/c++/v1/experimental/set
+OLD_FILES+=usr/include/c++/v1/experimental/simd
 OLD_FILES+=usr/include/c++/v1/experimental/string
 OLD_FILES+=usr/include/c++/v1/experimental/string_view
 OLD_FILES+=usr/include/c++/v1/experimental/system_error
@@ -4104,6 +4110,7 @@ OLD_FILES+=usr/include/c++/v1/experimental/vector
 OLD_FILES+=usr/include/c++/v1/ext/__hash
 OLD_FILES+=usr/include/c++/v1/ext/hash_map
 OLD_FILES+=usr/include/c++/v1/ext/hash_set
+OLD_FILES+=usr/include/c++/v1/filesystem
 OLD_FILES+=usr/include/c++/v1/float.h
 OLD_FILES+=usr/include/c++/v1/forward_list
 OLD_FILES+=usr/include/c++/v1/fstream
@@ -4139,6 +4146,7 @@ OLD_FILES+=usr/include/c++/v1/scoped_allocator
 OLD_FILES+=usr/include/c++/v1/set
 OLD_FILES+=usr/include/c++/v1/setjmp.h
 OLD_FILES+=usr/include/c++/v1/shared_mutex
+OLD_FILES+=usr/include/c++/v1/span
 OLD_FILES+=usr/include/c++/v1/sstream
 OLD_FILES+=usr/include/c++/v1/stack
 OLD_FILES+=usr/include/c++/v1/stdbool.h
@@ -4155,6 +4163,7 @@ OLD_FILES+=usr/include/c++/v1/strstream
 OLD_FILES+=usr/include/c++/v1/system_error
 OLD_FILES+=usr/include/c++/v1/tgmath.h
 OLD_FILES+=usr/include/c++/v1/thread
+OLD_FILES+=usr/include/c++/v1/version
 OLD_FILES+=usr/include/c++/v1/tr1/__bit_reference
 OLD_FILES+=usr/include/c++/v1/tr1/__bsd_locale_defaults.h
 OLD_FILES+=usr/include/c++/v1/tr1/__bsd_locale_fallbacks.h
@@ -4296,6 +4305,8 @@ OLD_FILES+=usr/lib32/libc++.a
 OLD_FILES+=usr/lib32/libc++.so
 OLD_LIBS+=usr/lib32/libc++.so.1
 OLD_FILES+=usr/lib32/libc++_p.a
+OLD_FILES+=usr/lib32/libc++experimental.a
+OLD_FILES+=usr/lib32/libc++fs.a
 OLD_FILES+=usr/lib32/libcxxrt.a
 OLD_FILES+=usr/lib32/libcxxrt.so
 OLD_LIBS+=usr/lib32/libcxxrt.so.1