diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/notify.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/notify.h
index 9b8390416..335043c19 120000
--- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/notify.h
+++ b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/notify.h
@@ -1 +1 @@
-../../../../../../../../src/libnotify/notify.h
\ No newline at end of file
+../../../../../../../../src/external/libnotify/notify.h
\ No newline at end of file
diff --git a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/notify_keys.h b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/notify_keys.h
index c033c9f8e..f0c6121ee 120000
--- a/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/notify_keys.h
+++ b/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/notify_keys.h
@@ -1 +1 @@
-../../../../../../../../src/libnotify/notify_keys.h
\ No newline at end of file
+../../../../../../../../src/external/libnotify/notify_keys.h
\ No newline at end of file
diff --git a/Developer/symlinks.sh b/Developer/symlinks.sh
index ac82b2651..5974aaab1 100755
--- a/Developer/symlinks.sh
+++ b/Developer/symlinks.sh
@@ -24,7 +24,7 @@ ln -sf "$BUILD/src/kernel/libsystem_kernel.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/keymgr/libkeymgr.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/libm/libsystem_m.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/libinfo/libsystem_info.dylib" "$LIBS/system"
-ln -sf "$BUILD/src/libnotify/libsystem_notify.dylib" "$LIBS/system"
+ln -sf "$BUILD/src/external/libnotify/libsystem_notify.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/external/libdispatch/libdispatch.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/external/compiler-rt/lib/builtins/libcompiler_rt.dylib" "$LIBS/system"
 ln -sf "$BUILD/src/libunwind/libunwind.dylib" "$LIBS/system"
diff --git a/cmake/use_ld64.cmake b/cmake/use_ld64.cmake
index 9b2c3570e..2357bb7ac 100644
--- a/cmake/use_ld64.cmake
+++ b/cmake/use_ld64.cmake
@@ -23,7 +23,7 @@ FUNCTION(use_ld64 target)
 -Wl,-dylib_file,/usr/lib/system/libremovefile.dylib:${CMAKE_BINARY_DIR}/src/libremovefile/libremovefile.dylib \
 -Wl,-dylib_file,/usr/lib/system/libcopyfile.dylib:${CMAKE_BINARY_DIR}/src/copyfile/libcopyfile.dylib \
 -Wl,-dylib_file,/usr/lib/system/libsystem_coreservices.dylib:${CMAKE_BINARY_DIR}/src/libsystem_coreservices/libsystem_coreservices.dylib \
--Wl,-dylib_file,/usr/lib/system/libsystem_notify.dylib:${CMAKE_BINARY_DIR}/src/libnotify/libsystem_notify_firstpass.dylib \
+-Wl,-dylib_file,/usr/lib/system/libsystem_notify.dylib:${CMAKE_BINARY_DIR}/src/external/libnotify/libsystem_notify_firstpass.dylib \
 -Wl,-dylib_file,/usr/lib/system/libdispatch.dylib:${CMAKE_BINARY_DIR}/src/external/libdispatch/liblibdispatch_shared_firstpass.dylib \
 -Wl,-dylib_file,/usr/lib/system/libmacho.dylib:${CMAKE_BINARY_DIR}/src/external/cctools/libmacho/libmacho_firstpass.dylib \
 -Wl,-dylib_file,/usr/lib/system/libsystem_sandbox.dylib:${CMAKE_BINARY_DIR}/src/sandbox/libsystem_sandbox.dylib \
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 106ccb299..f3ec1fc5d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -138,7 +138,7 @@ add_subdirectory(networkextension)
 add_subdirectory(external/libsystem)
 add_subdirectory(libsystem_coreservices)
 add_subdirectory(libutil)
-add_subdirectory(libnotify)
+add_subdirectory(external/libnotify)
 add_subdirectory(libremovefile)
 add_subdirectory(launchd)
 add_subdirectory(keymgr)
diff --git a/src/external/libnotify b/src/external/libnotify
index 2526674fb..fac2a3b8c 160000
--- a/src/external/libnotify
+++ b/src/external/libnotify
@@ -1 +1 @@
-Subproject commit 2526674fb546303a1190126226370e35c174893a
+Subproject commit fac2a3b8c585ada88b4a6a9a1e2b88b6a3782879
diff --git a/src/external/libsystem b/src/external/libsystem
index 96ea4fd33..d9b57d9cb 160000
--- a/src/external/libsystem
+++ b/src/external/libsystem
@@ -1 +1 @@
-Subproject commit 96ea4fd335cdf6f82c439a105d4879e6f01a7622
+Subproject commit d9b57d9cbf1c3e61884ef16b6389f5eac7ff71ae