diff --git a/nselib/redis.lua b/nselib/redis.lua
index 2398439d9..d91e4176a 100644
--- a/nselib/redis.lua
+++ b/nselib/redis.lua
@@ -49,7 +49,7 @@ Response = {
 	end,
 	
 	receive = function(self)
-		local status, data = self.socket:receive_buf("\r\n")
+		local status, data = self.socket:receive_buf("\r\n", false)
 		if ( not(status) ) then
 			return false, "Failed to receive data from server"
 		end
@@ -78,7 +78,7 @@ Response = {
 			
 			local len = tonumber(data:match("^%$(%d*)"))
 			-- we should only have a single line, so we can just peel of the length	
-			status, data = self.socket:receive_buf(match.numbytes(len))
+			status, data = self.socket:receive_buf(match.numbytes(len), false)
 			if( not(status) ) then
 				return false, "Failed to receive data from server"
 			end
@@ -93,12 +93,12 @@ Response = {
 			
 			for i=1, count do
 				-- peel of the length
-				local status = self.socket:receive_buf("\r\n")
+				local status = self.socket:receive_buf("\r\n", false)
 				if( not(status) ) then
 					return false, "Failed to receive data from server"
 				end
 
-				status, data = self.socket:receive_buf("\r\n")
+				status, data = self.socket:receive_buf("\r\n", false)
 				if( not(status) ) then
 					return false, "Failed to receive data from server"
 				end
diff --git a/nselib/rsync.lua b/nselib/rsync.lua
index d9f7e8374..b017b0007 100644
--- a/nselib/rsync.lua
+++ b/nselib/rsync.lua
@@ -39,7 +39,7 @@ Helper = {
 		if ( not(status) ) then
 			return false, err
 		end
-		local status, data = self.socket:receive_buf("\n")
+		local status, data = self.socket:receive_buf("\n", false)
 		if( not(status) ) then
 			return false, err
 		end
@@ -119,7 +119,7 @@ Helper = {
 		
 		local modules = {}
 		while(true) do
-			status, data = self.socket:receive_buf("\n")
+			status, data = self.socket:receive_buf("\n", false)
 			if (not(status)) then
 				return false, data
 			end
@@ -152,13 +152,13 @@ Helper = {
 			return false, data
 		end
 
-		status, data = self.socket:receive_buf(match.numbytes(4))
+		status, data = self.socket:receive_buf(match.numbytes(4), false)
 		if ( not(status) ) then
 			return false, data
 		end
 		
 		local pos, len = bin.unpack("<S", data)
-		status, data = self.socket:receive_buf(match.numbytes(len))
+		status, data = self.socket:receive_buf(match.numbytes(len), false)
 		if ( not(status) ) then
 			return false, data
 		end
diff --git a/nselib/stun.lua b/nselib/stun.lua
index 29932d853..16033de8f 100644
--- a/nselib/stun.lua
+++ b/nselib/stun.lua
@@ -236,7 +236,7 @@ Comm = {
 	-- @return response containing a response instance
 	--         err string containing an error message, if status is false
 	recv = function(self)	
-		local status, hdr_data = self.socket:receive_buf(match.numbytes(Header.size))
+		local status, hdr_data = self.socket:receive_buf(match.numbytes(Header.size), false)
 		if ( not(status) ) then
 			return false, "Failed to receive response from server"
 		end
@@ -246,7 +246,7 @@ Comm = {
 			return false, "Failed to parse response header"
 		end
 		
-		local status, data = self.socket:receive_buf(match.numbytes(header.length))
+		local status, data = self.socket:receive_buf(match.numbytes(header.length), false)
 		if ( header.type == MessageType.BINDING_RESPONSE ) then
 			local resp = Response.Bind.parse(hdr_data .. data)
 			return true, resp
diff --git a/nselib/xmpp.lua b/nselib/xmpp.lua
index b2e63195a..f55bdb642 100644
--- a/nselib/xmpp.lua
+++ b/nselib/xmpp.lua
@@ -139,7 +139,7 @@ XMPP = {
 		-- previous message.
 		self.socket:set_timeout(1)
 		repeat
-			local status = self.socket:receive_buf("\0")
+			local status = self.socket:receive_buf("\0", false)
 		until(not(status))
 		self.socket:set_timeout(self.options.timeout * 1000)
 	
diff --git a/scripts/dict-info.nse b/scripts/dict-info.nse
index 78c8dc671..4effd6d18 100644
--- a/scripts/dict-info.nse
+++ b/scripts/dict-info.nse
@@ -58,7 +58,7 @@ action = function(host, port)
 	local srvinfo
 	
 	repeat
-		local status, data = socket:receive_buf("\r\n")
+		local status, data = socket:receive_buf("\r\n", false)
 		if ( not(status) ) then
 			return fail("Failed to read response from server")
 		elseif ( data:match("^5") ) then
diff --git a/scripts/distcc-cve2004-2687.nse b/scripts/distcc-cve2004-2687.nse
index b7261af70..517ebbb53 100644
--- a/scripts/distcc-cve2004-2687.nse
+++ b/scripts/distcc-cve2004-2687.nse
@@ -95,7 +95,7 @@ earlier. The vulnerability is the consequence of weak service configuration.
 		end
 	end
 	
-	local status, data = socket:receive_buf("DOTO00000000")
+	local status, data = socket:receive_buf("DOTO00000000", false)
 
 	if ( status ) then
 		local output = data:match("SOUT%w%w%w%w%w%w%w%w(.*)")
diff --git a/scripts/gkrellm-info.nse b/scripts/gkrellm-info.nse
index 24142b74e..2af9f18eb 100644
--- a/scripts/gkrellm-info.nse
+++ b/scripts/gkrellm-info.nse
@@ -159,11 +159,11 @@ action = function(host, port)
 	end
 	
 	-- If there's an error we get a response back, and only then
-	local status, data = socket:receive_buf("\n")
+	local status, data = socket:receive_buf("\n", false)
 	if( status and data ~= "<error>" ) then
 		return fail("An unknown error occured, aborting ...")
 	elseif ( status ) then
-		status, data = socket:receive_buf("\n")
+		status, data = socket:receive_buf("\n", false)
 		if ( status ) then
 			return fail(data)
 		else
@@ -176,7 +176,7 @@ action = function(host, port)
 	end
 
 	local tags = {}
-	local status, tag = socket:receive_buf("\n")
+	local status, tag = socket:receive_buf("\n", false)
 	while(true) do
 		if ( not(status) ) then
 			break
@@ -194,7 +194,7 @@ action = function(host, port)
 		
 		while(true) do
 			local data
-			status, data = socket:receive_buf("\n")
+			status, data = socket:receive_buf("\n", false)
 			if ( not(status) ) then
 				break
 			end
diff --git a/scripts/gpsd-info.nse b/scripts/gpsd-info.nse
index abe9959fe..f378c64dc 100644
--- a/scripts/gpsd-info.nse
+++ b/scripts/gpsd-info.nse
@@ -77,7 +77,7 @@ action = function(host, port)
 	
 	repeat
 		local entry
-		status, line = socket:receive_buf("\r\n")
+		status, line = socket:receive_buf("\r\n", false)
 		if ( status ) then
 			status, entry = gps.NMEA.parse(line)
 			if ( status ) then
diff --git a/scripts/icap-info.nse b/scripts/icap-info.nse
index 44b48e2c6..b8aa3293e 100644
--- a/scripts/icap-info.nse
+++ b/scripts/icap-info.nse
@@ -97,7 +97,7 @@ action = function(host, port)
 			return fail("Failed to send request to server")
 		end
 		
-		local status, resp = socket:receive_buf("\r\n\r\n")
+		local status, resp = socket:receive_buf("\r\n\r\n", false)
 		if ( not(status) ) then
 			return fail("Failed to receive response from server")
 		end
diff --git a/scripts/memcached-info.nse b/scripts/memcached-info.nse
index 299e4dcdf..7f79ebb3e 100644
--- a/scripts/memcached-info.nse
+++ b/scripts/memcached-info.nse
@@ -73,7 +73,7 @@ end
 local function recvResponse(socket)	
 	local kvs = {}
 	repeat
-		local status, response = socket:receive_buf("\r\n")
+		local status, response = socket:receive_buf("\r\n", false)
 		if ( not(status) ) then
 			return false, "Failed to receive response from server"
 		end
diff --git a/scripts/vmauthd-brute.nse b/scripts/vmauthd-brute.nse
index a736e8441..260cc7400 100644
--- a/scripts/vmauthd-brute.nse
+++ b/scripts/vmauthd-brute.nse
@@ -45,7 +45,7 @@ Driver = {
 	end,
 	
 	login = function(self, username, password)
-		local status, line = self.socket:receive_buf("\r\n")
+		local status, line = self.socket:receive_buf("\r\n", false)
 		if ( line:match("^220 VMware Authentication Daemon.*SSL Required") ) then
 			self.socket:reconnect_ssl()
 		end
@@ -57,7 +57,7 @@ Driver = {
 			return false, err
 		end
 		
-		local status, response = self.socket:receive_buf("\r\n")
+		local status, response = self.socket:receive_buf("\r\n", false)
 		if ( not(status) or not(response:match("^331") ) ) then
 			local err = brute.Error:new( "Received unexpected response from server" )
 			err:setRetry( true )
@@ -70,7 +70,7 @@ Driver = {
 			err:setRetry( true )
 			return false, err
 		end
-		status, response = self.socket:receive_buf("\r\n")
+		status, response = self.socket:receive_buf("\r\n", false)
 
 		if ( response:match("^230") ) then
 			return true, brute.Account:new(username, password, creds.State.VALID)
@@ -93,7 +93,7 @@ local function checkAuthd(host, port)
 		return false, "Failed to connect to server"
 	end
 
-	local status, line = socket:receive_buf("\r\n")
+	local status, line = socket:receive_buf("\r\n", false)
 	socket:close()
 	if ( not(status) ) then
 		return false, "Failed to receive response from server"