diff --git a/CHANGELOG b/CHANGELOG
index 463bc67a3..74b721ab2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 #Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE][GH#1099] Fix http-fetch to keep downloaded files in separate
+  destination directories. [Aniket Pandey]
+
 o [NSE] Added two new fingerprints to http-default-accounts
   (Hikvision DS-XXX Network Camera and NUOO DVR) [Paulino Calderon]
 
diff --git a/scripts/http-fetch.nse b/scripts/http-fetch.nse
index 631e1c77b..7ac99cadb 100644
--- a/scripts/http-fetch.nse
+++ b/scripts/http-fetch.nse
@@ -211,10 +211,12 @@ action = function(host, port)
     return output, output.ERROR
   end
 
+  local sub_directory = tostring(host.ip) .. ":" ..  tostring(port.number) .. SEPARATOR
+
   if destination:sub(-1) == '\\' or destination:sub(-1) == '/' then
-    destination = destination
+    destination = destination .. sub_directory
   else
-    destination = destination .. SEPARATOR
+    destination = destination .. SEPARATOR .. sub_directory
   end
 
   if paths then