diff --git a/cmake/use_ld64.cmake b/cmake/use_ld64.cmake
index 3819058f6..3eeedeb53 100644
--- a/cmake/use_ld64.cmake
+++ b/cmake/use_ld64.cmake
@@ -55,7 +55,10 @@ FUNCTION(use_ld64 target)
 -Wl,-dylib_file,/usr/lib/libbz2.1.0.dylib:${CMAKE_BINARY_DIR}/src/external/bzip2/libbz2.1.0.dylib \
 -Wl,-dylib_file,/usr/lib/libssl.0.9.8.dylib:${CMAKE_BINARY_DIR}/src/external/openssl/src/libssl.0.9.8.dylib \
 -Wl,-dylib_file,/usr/lib/libcrypto.0.9.8.dylib:${CMAKE_BINARY_DIR}/src/external/openssl/src/libcrypto.0.9.8.dylib \
--Wl,-dylib_file,/usr/lib/native/libGL.dylib:${CMAKE_BINARY_DIR}/src/native/libGL.dylib ")
+-Wl,-dylib_file,/usr/lib/native/libGL.dylib:${CMAKE_BINARY_DIR}/src/native/libGL.dylib \
+-Wl,-dylib_file,/System/Library/Frameworks/CoreImage.framework/Versions/A/CoreImage:${CMAKE_BINARY_DIR}/src/CoreImage/CoreImage \
+-Wl,-dylib_file,/System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo:${CMAKE_BINARY_DIR}/src/CoreVideo/CoreVideo \
+")
 
 	add_dependencies(${target} x86_64-apple-darwin11-ld)
 
diff --git a/src/CoreServices/constants.m b/src/CoreServices/constants.m
index 77b33774e..3edcc0188 100644
--- a/src/CoreServices/constants.m
+++ b/src/CoreServices/constants.m
@@ -26,6 +26,8 @@
 const CFStringRef kUTTypePDF = CFSTR("com.adobe.pdf");
 const CFStringRef kUTTypeSourceCode = CFSTR("public.source-code");
 const CFStringRef kUTTypeSwiftSource = CFSTR("public.swift-source");
+const CFStringRef kUTTypeText = CFSTR("public.text");
+const CFStringRef kUTTypeFramework = CFSTR("com.apple.framework");
 
 const CFStringRef _kLSASNKey = CFSTR("LSASN");
 const CFStringRef _kLSApplicationTypeKey = CFSTR("ApplicationType");
diff --git a/src/external/cocotron b/src/external/cocotron
index cdc087957..94403265a 160000
--- a/src/external/cocotron
+++ b/src/external/cocotron
@@ -1 +1 @@
-Subproject commit cdc0879572bf04bd1f0640c0468c9b9d7596140e
+Subproject commit 94403265abc41b1852d373c244c3017f7d1ba382