diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index de2c2a22287b..060327c74d4a 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1855 2013/11/12 00:10:29 joerg Exp $
+#	$NetBSD: mi,v 1.1856 2013/11/12 16:39:39 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -259,6 +259,7 @@
 ./usr/include/c++/cwctype			comp-cxx-include	libcxx
 ./usr/include/c++/cxxabi.h			comp-cxx-include	libcxx
 ./usr/include/c++/deque				comp-cxx-include	libcxx
+./usr/include/c++/dynarray			comp-cxx-include	libcxx
 ./usr/include/c++/exception			comp-cxx-include	libcxx
 ./usr/include/c++/ext/__hash			comp-cxx-include	libcxx
 ./usr/include/c++/ext/hash_map			comp-cxx-include	libcxx
@@ -282,6 +283,7 @@
 ./usr/include/c++/mutex				comp-cxx-include	libcxx
 ./usr/include/c++/new				comp-cxx-include	libcxx
 ./usr/include/c++/numeric			comp-cxx-include	libcxx
+./usr/include/c++/optional			comp-cxx-include	libcxx
 ./usr/include/c++/ostream			comp-cxx-include	libcxx
 ./usr/include/c++/queue				comp-cxx-include	libcxx
 ./usr/include/c++/random			comp-cxx-include	libcxx
@@ -289,6 +291,7 @@
 ./usr/include/c++/regex				comp-cxx-include	libcxx
 ./usr/include/c++/scoped_allocator		comp-cxx-include	libcxx
 ./usr/include/c++/set				comp-cxx-include	libcxx
+./usr/include/c++/shared_mutex			comp-cxx-include	libcxx
 ./usr/include/c++/sstream			comp-cxx-include	libcxx
 ./usr/include/c++/stack				comp-cxx-include	libcxx
 ./usr/include/c++/stdexcept			comp-cxx-include	libcxx
diff --git a/external/bsd/libc++/include/Makefile b/external/bsd/libc++/include/Makefile
index 903d9574be7b..b6c3a62b40cd 100644
--- a/external/bsd/libc++/include/Makefile
+++ b/external/bsd/libc++/include/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2013/10/17 22:07:59 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2013/11/12 16:39:39 joerg Exp $
 
 .include <bsd.init.mk>
 
@@ -55,6 +55,7 @@ INCS=	__bit_reference \
 	cwchar \
 	cwctype \
 	deque \
+	dynarray \
 	exception \
 	forward_list \
 	fstream \
@@ -75,6 +76,7 @@ INCS=	__bit_reference \
 	mutex \
 	new \
 	numeric \
+	optional \
 	ostream \
 	queue \
 	random \
@@ -82,6 +84,7 @@ INCS=	__bit_reference \
 	regex \
 	scoped_allocator \
 	set \
+	shared_mutex \
 	sstream \
 	stack \
 	stdexcept \
diff --git a/external/bsd/libc++/lib/Makefile b/external/bsd/libc++/lib/Makefile
index 46b7b10d5996..4b8d4a147cbf 100644
--- a/external/bsd/libc++/lib/Makefile
+++ b/external/bsd/libc++/lib/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2013/05/17 22:57:27 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2013/11/12 16:39:39 joerg Exp $
 
 LIB=		c++
 WARNS=		4
@@ -10,7 +10,8 @@ NOLINT=		# defined
 
 SRCS=	algorithm.cpp bind.cpp chrono.cpp condition_variable.cpp debug.cpp \
 	exception.cpp future.cpp hash.cpp ios.cpp iostream.cpp locale.cpp \
-	memory.cpp mutex.cpp new.cpp random.cpp regex.cpp stdexcept.cpp \
+	memory.cpp mutex.cpp new.cpp optional.cpp random.cpp regex.cpp \
+	shared_mutex.cpp stdexcept.cpp \
 	string.cpp strstream.cpp system_error.cpp thread.cpp \
 	utility.cpp valarray.cpp
 # typeinfo.cc: prefer libcxxrt's version