diff --git a/config.w32 b/config.w32
index c173fda..12efcf6 100644
--- a/config.w32
+++ b/config.w32
@@ -1,29 +1,23 @@
 
 // vim:ft=javascript
 
-ARG_ENABLE("uv-httpparser", "for httpparser support in the uv extension", "yes");
+ARG_WITH("uv", "for uv support", "no");
 
 if (PHP_UV != "no") {
-    var libuv_target_dir = ".\\libuv\\Release";
-    if (PHP_DEBUG == "yes") {
-      libuv_target_dir = ".\\libuv\\Debug"
-    }
+	if (PHP_SOCKETS == "no") {
+		ERROR('uv depends on the sockets extension');
+	}
 
-    if (CHECK_HEADER_ADD_INCLUDE("uv.h", "CFLAGS_UV", PHP_EXTRA_INCLUDES + ';' + configure_module_dirname + "\\libuv\\include") &&
-        CHECK_LIB("uv.lib;libuv.lib", "uv", PHP_EXTRA_LIBS + ';' + libuv_target_dir)
-    ) {
-        EXTENSION('uv', 'php_uv.c uv.c');
-    } else {
-        WARNING("uv not enabled; libraries and/or headers not found. You have to execute vcbuild.bat first");
-    }
+	if (CHECK_HEADER_ADD_INCLUDE("uv.h", "CFLAGS_UV", PHP_UV + "\\include")
+		&& CHECK_LIB("libuv.lib", "uv", PHP_UV)) {
+		EXTENSION('uv', 'php_uv.c uv.c', PHP_UV_SHARED);
+	} else {
+		WARNING("uv not enabled; libraries and/or headers not found");
+	}
 
-    CHECK_LIB("Iphlpapi.lib","uv", PHP_UV);
-    CHECK_LIB("psapi.lib","uv", PHP_UV);
-    CHECK_LIB("Ws2_32.lib","uv", PHP_UV);
+	CHECK_LIB("Iphlpapi.lib","uv", PHP_UV);
+	CHECK_LIB("psapi.lib","uv", PHP_UV);
+	CHECK_LIB("Ws2_32.lib","uv", PHP_UV);
 
-    if (PHP_SOCKETS != "no") {
-        ADD_EXTENSION_DEP('uv', 'sockets', false);
-    } else {
-        ERROR('uv depends on the sockets extension');
-    }
+	ADD_EXTENSION_DEP('uv', 'sockets', false);
 }