diff --git a/Jamfile b/Jamfile
index fcfd4e3c0..2e247fe0a 100755
--- a/Jamfile
+++ b/Jamfile
@@ -9,11 +9,7 @@ use-project /boost/thread : $(BOOST_ROOT)/libs/thread/build ;
 use-project /boost/filesystem : $(BOOST_ROOT)/libs/filesystem/build ;
 use-project /boost/date_time : $(BOOST_ROOT)/libs/date_time/build ;
 
-lib winsock : : <name>wsock32.lib ;
-
-project torrent
-	: requirements
-
+REQUIREMENTS = 
 	<include>./include
 	<include>./zlib
 	<include>$(BOOST_ROOT)
@@ -36,19 +32,15 @@ project torrent
 # darwin switches
 
 	<toolset>darwin:<cxxflags>-Wno-unused-variable
+	;
 
-	: usage-requirements 
-
+USAGE_REQIREMENTS =
 	<include>./include
 	<include>$(BOOST_ROOT)
 	<variant>release:<define>NDEBUG
 	<define>BOOST_ALL_NO_LIB
-
 	;
 
-
-LIBS = ;
-
 SOURCES =
 	allocate_resources.cpp
 	alert.cpp
@@ -89,9 +81,10 @@ ZLIB_SOURCES =
 
 # some windows specific settings
 
-	if [ modules.peek : NT ]
+	if [ os.name ] = NT
 	{
-		LIBS += winsock ;
+		lib winsock : : <name>wsock32.lib ;
+		REQUIREMENTS += <library>winsock ;
 		SOURCES += file_win.cpp ;
 	}
 	else
@@ -99,11 +92,18 @@ ZLIB_SOURCES =
 		SOURCES += file.cpp ;
 	}
 
+project torrent
+	: requirements
+	$(REQUIREMENTS)
+	: usage-requirements 
+	$(USAGE_REQUIREMENTS)
+	;
+
+
 lib torrent
 	:
 	src/$(SOURCES)
 	zlib/$(ZLIB_SOURCES)
-	$(LIBS)
 	:
 	<threading>multi
 	<link>static
diff --git a/examples/client_test.cpp b/examples/client_test.cpp
index ac95c44b9..6f9596e2f 100755
--- a/examples/client_test.cpp
+++ b/examples/client_test.cpp
@@ -247,8 +247,8 @@ int main(int argc, char* argv[])
 //		ses.set_upload_rate_limit(100000);
 //		ses.set_download_rate_limit(50000);
 		ses.set_http_settings(settings);
-//		ses.set_severity_level(alert::debug);
-		ses.set_severity_level(alert::info);
+		ses.set_severity_level(alert::debug);
+//		ses.set_severity_level(alert::info);
 
 		for (int i = 0; i < argc-1; ++i)
 		{