diff --git a/CHANGELOG b/CHANGELOG
index bdada03ff..443f18d6f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,8 @@ o Added NSE Datafiles library which reads and parses Nmap's nmap-*
   (e.g. port numbers) indexing names (e.g. service names).  The
   rpcinfo.nse script was also updated to use this library. [Kris]
 
+o Now ports in the "unfiltered" state can be selected in NSE. [Kris]
+
 o Corrected uptime parsing and reporting in SNMPsysdesr.nse for an
   uptime of less than 46 hours. [Kris]
 
diff --git a/nse_main.cc b/nse_main.cc
index c5f1d1a97..f25116350 100644
--- a/nse_main.cc
+++ b/nse_main.cc
@@ -499,6 +499,10 @@ int process_preparehost(lua_State* l, Target* target, std::list<struct thread_re
 		SCRIPT_ENGINE_TRY(process_pickScriptsForPort(l, target, current, torun));
 	}
 
+	while((current = plist->nextPort(current, TCPANDUDP, PORT_UNFILTERED)) != NULL) {
+		SCRIPT_ENGINE_TRY(process_pickScriptsForPort(l, target, current, torun));
+	}
+
 	// pop the hostinfo, we don't need it anymore
 	lua_pop(l, 1);