diff --git a/CHANGELOG b/CHANGELOG
index 2bfe7e0a5..b9ba952bb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE] Fixed a bug where the brute library would not abort even after all
+  retries were exhausted [Patrik]
+
 o Added a service probe for VMware ESX Server. The probe is based on a
   script written by Aleksey Tyurin.
 
diff --git a/nselib/brute.lua b/nselib/brute.lua
index ce498667f..e94eb9495 100644
--- a/nselib/brute.lua
+++ b/nselib/brute.lua
@@ -524,6 +524,8 @@ Engine =
 		if ( retries == 0 ) then
 			Engine.terminate_all = true
 			self.error = "Too many retries, aborted ..."
+			response = Error:new("Too many retries, aborted ...")
+			response.abort = true
 		end
 		return status, response
 	end,