diff --git a/app/main.py b/app/main.py
index 0d07f11..d0835fb 100644
--- a/app/main.py
+++ b/app/main.py
@@ -423,6 +423,7 @@ def _netmap_save(data: dict):
 def _netmap_parse(output: str) -> list[dict]:
     hosts = []
     current: dict = {}
+    in_script = False
     for line in output.splitlines():
         m_host = re.search(r"Nmap scan report for (.+)", line)
         if m_host:
@@ -431,25 +432,35 @@ def _netmap_parse(output: str) -> list[dict]:
             raw = m_host.group(1)
             ip_m = re.search(r"\((\d+\.\d+\.\d+\.\d+)\)", raw)
             if ip_m:
-                current = {"ip": ip_m.group(1), "hostname": raw.split("(")[0].strip(), "mac": "", "vendor": ""}
+                current = {"ip": ip_m.group(1), "hostname": raw.split("(")[0].strip(), "mac": "", "vendor": "", "netbios": ""}
             else:
-                current = {"ip": raw.strip(), "hostname": "", "mac": "", "vendor": ""}
+                current = {"ip": raw.strip(), "hostname": "", "mac": "", "vendor": "", "netbios": ""}
+            in_script = False
             continue
         m_mac = re.search(r"MAC Address: ([0-9A-F:]+)\s*(?:\((.+)\))?", line, re.I)
         if m_mac:
             current["mac"] = m_mac.group(1)
             current["vendor"] = m_mac.group(2) or ""
+            continue
+        # Résultat du script nbstat
+        m_nb = re.search(r"NetBIOS name: ([^,]+)", line, re.I)
+        if m_nb:
+            nb = m_nb.group(1).strip()
+            if nb and nb.lower() not in ("<unknown>", ""):
+                current["netbios"] = nb
     if current.get("ip"):
         hosts.append(current)
     return hosts
 
 
+
 @app.get("/api/netmap/scan")
 def api_netmap_scan():
     try:
         r = subprocess.run(
-            ["nmap", "-sn", "-T4", "--host-timeout", "2s", NETMAP_RANGE],
-            capture_output=True, text=True, timeout=120
+            ["nmap", "-sn", "-T4", "-R", "--dns-servers", "192.168.1.1",
+             "--host-timeout", "3s", "--script", "nbstat", NETMAP_RANGE],
+            capture_output=True, text=True, timeout=180
         )
         hosts = _netmap_parse(r.stdout)
         return {"hosts": hosts, "names": _netmap_load()}
diff --git a/static/index.html b/static/index.html
index 641646d..37ebcd2 100644
--- a/static/index.html
+++ b/static/index.html
@@ -537,21 +537,28 @@ function netmapRender(hosts) {
   if (!hosts.length) { el.innerHTML = '<span style="color:var(--muted)">Aucun appareil détecté.</span>'; return; }
   const rows = hosts.map(h => {
     const k = h.ip.replace(/\./g, '_');
-    const name = _netmapNames[h.ip] || '';
+    // Meilleur nom détecté : NetBIOS > hostname DNS > fabricant
+    const detected = h.netbios || h.hostname || '';
+    const savedName = _netmapNames[h.ip] || '';
+    // Pré-remplir le champ avec le nom détecté si pas encore de nom sauvegardé
+    const inputVal = savedName || detected;
+    const detectedBadge = detected
+      ? `<span style="font-size:10px;color:var(--muted);margin-left:4px" title="${h.netbios ? 'NetBIOS' : 'DNS'}">${h.netbios ? '🔵' : '🔤'} ${detected}</span>`
+      : '';
     return `<tr>
       <td><code style="color:var(--accent)">${h.ip}</code></td>
       <td><code style="color:var(--muted);font-size:12px">${h.mac || '—'}</code></td>
       <td style="color:var(--muted);font-size:12px">${h.vendor || '—'}</td>
-      <td style="color:var(--muted);font-size:12px">${h.hostname || '—'}</td>
+      <td style="font-size:12px">${detectedBadge || '<span style="color:var(--muted)">—</span>'}</td>
       <td>
-        <input class="netmap-name-input" id="nm_${k}" value="${h.ip in _netmapNames ? _netmapNames[h.ip].replace(/"/g,'&quot;') : ''}" placeholder="Nom perso…">
+        <input class="netmap-name-input" id="nm_${k}" value="${inputVal.replace(/"/g,'&quot;').replace(/</g,'&lt;')}" placeholder="Nom perso…">
         <button class="netmap-save-btn" onclick="netmapSaveName('${h.ip}')">Sauver</button>
         <span class="netmap-flash" id="nmf_${k}"></span>
       </td>
     </tr>`;
   }).join('');
   el.innerHTML = `<table>
-    <thead><tr><th>IP</th><th>MAC</th><th>Fabricant</th><th>Hostname</th><th>Nom perso</th></tr></thead>
+    <thead><tr><th>IP</th><th>MAC</th><th>Fabricant</th><th>Nom détecté</th><th>Nom perso</th></tr></thead>
     <tbody>${rows}</tbody>
   </table>`;
 }