diff --git a/CMake/HHVMExtensionConfig.cmake b/CMake/HHVMExtensionConfig.cmake
index b4418e8b836cd..bb41de35f78a8 100644
--- a/CMake/HHVMExtensionConfig.cmake
+++ b/CMake/HHVMExtensionConfig.cmake
@@ -908,15 +908,15 @@ function (HHVM_EXTENSION_INTERNAL_HANDLE_LIBRARY_DEPENDENCY extensionID dependen
         /usr/lib
         /usr/local/lib
     )
-    IF (PGSQL_INCLUDE_DIR AND PGSQL_LIBRARY)
-      if(${addPaths})
-        include_directories(${PGSQL_INCLUDE_DIR})
-        link_libraries(${PGSQL_LIBRARY})
-      endif()
-    else()
+    IF (NOT PGSQL_INCLUDE_DIR OR NOT PGSQL_LIBRARY)
       HHVM_EXTENSION_INTERNAL_SET_FAILED_DEPENDENCY(${extensionID} ${dependencyName})
       return()
     endif()
+    
+    if(${addPaths})
+      include_directories(${PGSQL_INCLUDE_DIR})
+      link_libraries(${PGSQL_LIBRARY})
+    endif()
   elseif (${libraryName} STREQUAL "png")
     find_package(LibPng ${requiredVersion})
     if (NOT LIBPNG_INCLUDE_DIRS OR NOT LIBPNG_LIBRARIES)
diff --git a/hphp/CMakeLists.txt b/hphp/CMakeLists.txt
index 921708795846d..823a28ae26ad9 100644
--- a/hphp/CMakeLists.txt
+++ b/hphp/CMakeLists.txt
@@ -20,6 +20,7 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/facebook")
   # of hphp/, so we need to pull that one in first if it exists
   CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7 FATAL_ERROR)
   get_filename_component(HPHP_HOME "${CMAKE_CURRENT_SOURCE_DIR}/.." ABSOLUTE)
+  set(ENABLE_EXTENSION_PGSQL OFF CACHE INTERNAL "" FORCE)
   set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/facebook/CMake"
                         "${CMAKE_CURRENT_SOURCE_DIR}/public_tld/CMake"
                         ${CMAKE_MODULE_PATH})
diff --git a/third-party b/third-party
index e411a8db6ee88..3a5cf36a1da84 160000
--- a/third-party
+++ b/third-party
@@ -1 +1 @@
-Subproject commit e411a8db6ee885180a63166dde3ff3ac9b50619b
+Subproject commit 3a5cf36a1da84ebf5fd0a959a326bda1fd25e255