diff --git a/CHANGELOG b/CHANGELOG
index c5e0ed9b7..01cc3a799 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE][GH#588] Fix a crash in smb.lua when using smb-ls due to a
+  floating-point number being passed to os.time ("bad argument").
+  [Dallas Winger]
+
 o [NSE][GH#596] Fix a bug in mysql.lua that caused authentication failures in
   mysql-brute and other scripts due to including a null terminator in the salt
   value. This bug affects Nmap 7.25BETA2 and later releases.  [Daniel Miller]
diff --git a/nselib/smb.lua b/nselib/smb.lua
index 5006de687..02a28c0f6 100644
--- a/nselib/smb.lua
+++ b/nselib/smb.lua
@@ -2805,7 +2805,7 @@ function find_files(smbstate, fname, options)
         pos, fe.s_fname = bin.unpack("A24", response.data, pos)
 
         local time = fe.created
-        time = (time / 10000000) - 11644473600
+        time = (time // 10000000) - 11644473600
         fe.created = os.date("%Y-%m-%d %H:%M:%S", time)
 
         -- TODO: cleanup fe.s_fname