diff --git a/CHANGELOG b/CHANGELOG
index ec16aed6f..1cbde0e8f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE] Correct global access errors in afp.lua reported by Patrick Donnelly
+  [Patrik]
+
 o [NSE] Correct misspelled "Capabilities.IgnoreSpaceBeforeParanthesis"
   name in the MySQL library. [Kris]
 
@@ -24,7 +27,6 @@ o [NSE] New script dns-fuzz launches a fuzzing attack against DNS
   servers. Added a new category - fuzzer - for scripts like this.
   [Michael Pattrick]
 
-
 o [NSE] Fixed bug in rpc.lua library that incorrectly required file handles
   to be 32 octects when calling the ReadDir function. The bug was reported by
   Djalal Harouni. [Patrik]
diff --git a/nselib/afp.lua b/nselib/afp.lua
index f7b9e2af4..88b802cb3 100644
--- a/nselib/afp.lua
+++ b/nselib/afp.lua
@@ -747,9 +747,9 @@ Proto = {
 				for j = 1, 7 do
 					addr = addr .. string.format("%04x:", octet[j])
 				end
-				addr = addr .. string.format("%04x", octet[8], port)
+				addr = addr .. string.format("%04x", octet[8])
 
-				table.insert(result.network_addresses, temp)
+				table.insert(result.network_addresses, addr)
 			elseif tag == 0x07 then
 				-- 16 byte ipv6 and two byte port
 				local octet = {}