diff --git a/configure b/configure
index 467876969..7156568ba 100755
--- a/configure
+++ b/configure
@@ -58,6 +58,14 @@ def configure_glfw3(o):
   o['variables']['glfw3_libraries'] = ret[0].split()
   o['variables']['glfw3_cflags'] = ret[1].split()
 
+def configure_uv(o):
+  ret = pkg_config('libuv', options.pkgconfig_root)
+  if not ret:
+      sys.stderr.write('could not find uv with pkg-config')
+      sys.exit(-1)
+  o['variables']['uv_libraries'] = ret[0].split()
+  o['variables']['uv_cflags'] = ret[1].split()
+
 def configure_png(o):
   ret = pkg_config('libpng', options.pkgconfig_root)
   if not ret:
@@ -93,6 +101,7 @@ output = {
 if __name__ == '__main__':
   configure_llmr(output)
   configure_glfw3(output)
+  configure_uv(output)
   configure_png(output)
   configure_curl(output)
   pprint.pprint(output, indent=2)
diff --git a/setup-libraries.sh b/setup-libraries.sh
index 64099df94..9324ae108 100755
--- a/setup-libraries.sh
+++ b/setup-libraries.sh
@@ -6,29 +6,34 @@ if [ ! -d 'mapnik-packaging' ]; then
 fi
 
 cd mapnik-packaging/osx/
-git pull
+# git pull
 
 export CXX11=true
 
 source iPhoneOS.sh
     if [ ! -f out/build-cpp11-libcpp-armv7/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi
+    if [ ! -f out/build-cpp11-libcpp-armv7/lib/libuv.a ] ; then ./scripts/build_uv.sh ; fi
     echo '     ...done'
 
 source iPhoneOSs.sh
     if [ ! -f out/build-cpp11-libcpp-armv7s/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi
+    if [ ! -f out/build-cpp11-libcpp-armv7s/lib/libuv.a ] ; then ./scripts/build_uv.sh ; fi
     echo '     ...done'
 
 source iPhoneOS64.sh
     if [ ! -f out/build-cpp11-libcpp-arm64/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi
+    if [ ! -f out/build-cpp11-libcpp-arm64/lib/libuv.a ] ; then ./scripts/build_uv.sh ; fi
     echo '     ...done'
 
 source iPhoneSimulator.sh
     if [ ! -f out/build-cpp11-libcpp-i386/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi
+    if [ ! -f out/build-cpp11-libcpp-i386/lib/libuv.a ] ; then ./scripts/build_uv.sh ; fi
     echo '     ...done'
 
 source MacOSX.sh
     if [ ! -f out/build-cpp11-libcpp-x86_64/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi
     if [ ! -f out/build-cpp11-libcpp-x86_64/lib/libglfw3.a ] ; then ./scripts/build_glfw.sh ; fi
+    if [ ! -f out/build-cpp11-libcpp-x86_64/lib/libuv.a ] ; then ./scripts/build_uv.sh ; fi
     if [ ! -f out/build-cpp11-libcpp-x86_64/lib/libssl.a ] ; then ./scripts/build_openssl.sh ; fi
     if [ ! -f out/build-cpp11-libcpp-x86_64/lib/libcurl.a ] ; then ./scripts/build_curl.sh ; fi
     echo '     ...done'