diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08ede45af..2f95b0ddf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,9 +177,9 @@ InstallSymlink(private/etc ${CMAKE_INSTALL_PREFIX}/libexec/darling/etc)
 InstallSymlink(private/var ${CMAKE_INSTALL_PREFIX}/libexec/darling/var)
 
 install(FILES etc/resolv.conf
-	DESTINATION libexec/darling/etc)
-InstallSymlink(/Volumes/SystemRoot/etc/machine-id ${CMAKE_INSTALL_PREFIX}/libexec/darling/etc/machine-id)
-InstallSymlink(/Volumes/SystemRoot/etc/nsswitch.conf ${CMAKE_INSTALL_PREFIX}/libexec/darling/etc/nsswitch.conf)
+	DESTINATION libexec/darling/private/etc)
+InstallSymlink(/Volumes/SystemRoot/etc/machine-id ${CMAKE_INSTALL_PREFIX}/libexec/darling/private/etc/machine-id)
+InstallSymlink(/Volumes/SystemRoot/etc/nsswitch.conf ${CMAKE_INSTALL_PREFIX}/libexec/darling/private/etc/nsswitch.conf)
 
 install(DIRECTORY DESTINATION libexec/darling/Volumes)
 install(DIRECTORY DESTINATION libexec/darling/Volumes/SystemRoot)
@@ -198,10 +198,10 @@ install(DIRECTORY DESTINATION libexec/darling/usr/local/share)
 InstallSymlink(/Volumes/SystemRoot/dev ${CMAKE_INSTALL_PREFIX}/libexec/darling/dev)
 InstallSymlink(private/tmp ${CMAKE_INSTALL_PREFIX}/libexec/darling/tmp)
 
-InstallSymlink(/proc/self/mounts ${CMAKE_INSTALL_PREFIX}/libexec/darling/etc/mtab)
-#InstallSymlink(/Volumes/SystemRoot/etc/passwd ${CMAKE_INSTALL_PREFIX}/libexec/darling/etc/passwd)
-#InstallSymlink(/Volumes/SystemRoot/etc/group ${CMAKE_INSTALL_PREFIX}/libexec/darling/etc/group)
-InstallSymlink(/Volumes/SystemRoot/etc/localtime ${CMAKE_INSTALL_PREFIX}/libexec/darling/etc/localtime)
+InstallSymlink(/proc/self/mounts ${CMAKE_INSTALL_PREFIX}/libexec/darling/private/etc/mtab)
+#InstallSymlink(/Volumes/SystemRoot/etc/passwd ${CMAKE_INSTALL_PREFIX}/libexec/darling/private/etc/passwd)
+#InstallSymlink(/Volumes/SystemRoot/etc/group ${CMAKE_INSTALL_PREFIX}/libexec/darling/private/etc/group)
+InstallSymlink(/Volumes/SystemRoot/etc/localtime ${CMAKE_INSTALL_PREFIX}/libexec/darling/private/etc/localtime)
 
 InstallSymlink(/Volumes/SystemRoot/usr/share/zoneinfo ${CMAKE_INSTALL_PREFIX}/libexec/darling/usr/share/zoneinfo)
 
diff --git a/src/external/libressl-2.8.3 b/src/external/libressl-2.8.3
index 2bb9d61d6..2a56b36b7 160000
--- a/src/external/libressl-2.8.3
+++ b/src/external/libressl-2.8.3
@@ -1 +1 @@
-Subproject commit 2bb9d61d6ab6b32361fa1b8a0acc4316d62ba0b6
+Subproject commit 2a56b36b77a00573c53ccd8e6932eb136172c950
diff --git a/src/external/nano b/src/external/nano
index 00d0ca07a..99964babb 160000
--- a/src/external/nano
+++ b/src/external/nano
@@ -1 +1 @@
-Subproject commit 00d0ca07a261806e4b90e9d236dda279884c7808
+Subproject commit 99964babbcec82e3a028cb3e44307edeb794980f