diff --git a/NOTES.rst b/NOTES.rst
index 2d8452ca1f..649aeafa64 100644
--- a/NOTES.rst
+++ b/NOTES.rst
@@ -46,6 +46,15 @@ management profiles also for this.
 Please read more in :doc:`the ipdevpoll reference documentation
 </reference/ipdevpoll>` for configuration details.
 
+Changed names of NAV command line programs
+------------------------------------------
+
+NAV 5.9 changed the names of most of NAV's command line programs by removing
+their ``.py`` file name extensions.  However, the :program:`snmptrapd` program
+had a naming conflict with Net-SNMP's trap daemon, if installed.  NAV 5.10.1
+renames the NAV trap daemon to :program:`navtrapd`.  Please ensure your
+:file:`daemons.yml` configuration file is up to date after an upgrade.
+
 
 NAV 5.9
 =======
diff --git a/changelog.d/2926.changed.md b/changelog.d/2926.changed.md
new file mode 100644
index 0000000000..e0370f295c
--- /dev/null
+++ b/changelog.d/2926.changed.md
@@ -0,0 +1 @@
+`snmptrapd` renamed to `navtrapd` to avoid naming conflicts with Net-SNMP programs
\ No newline at end of file
diff --git a/doc/reference/snmptrapd.rst b/doc/reference/snmptrapd.rst
index a3985f4fc0..2806917310 100644
--- a/doc/reference/snmptrapd.rst
+++ b/doc/reference/snmptrapd.rst
@@ -5,11 +5,12 @@
 What is the SNMP trap daemon?
 =============================
 
-:program:`snmptrapd` is a NAV backend service program, designed to receive SNMP
-trap messages sent to the NAV server. It hands trap messages off to trap
-handler plugins, which will process them, and typically translate them into NAV
-events as they see fit.  Anyone with some knowledge of Python and SNMP should
-be able to write a new trap handler plugin.
+:program:`snmptrapd` (a.k.a. :program:`navtrapd` to avoid name conflicts with
+Net-SNMP's similarly named trap daemon) is a NAV backend service program,
+designed to receive SNMP trap messages sent to the NAV server. It hands trap
+messages off to trap handler plugins, which will process them, and typically
+translate them into NAV events as they see fit.  Anyone with some knowledge of
+Python and SNMP should be able to write a new trap handler plugin.
 
 snmptrapd uses the :mod:`pynetsnmp-2` library (via NAV's own :py:mod:`nav.Snmp`
 adapter module), but is loosely based on this example from the PySNMP library:
@@ -30,7 +31,7 @@ the port is bound.
 
 ::
 
-    usage: snmptrapd [-h] [-d] [-c COMMUNITY] [address [address ...]]
+    usage: navtrapd [-h] [-d] [-c COMMUNITY] [address [address ...]]
 
     NAV SNMP Trap daemon
 
@@ -108,4 +109,3 @@ nav.snmptrapd.trap.SNMPTrap
 .. autoclass:: nav.snmptrapd.trap.SNMPTrap
    :members:
    :show-inheritance:
-
diff --git a/pyproject.toml b/pyproject.toml
index bc0b9f5839..b0c36c882f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,7 +55,7 @@ pping = "nav.bin.pping:main"
 radiusparser = "nav.bin.radiusparser:main"
 servicemon = "nav.bin.servicemon:main"
 smsd = "nav.bin.smsd:main"
-snmptrapd = "nav.bin.snmptrapd:main"
+navtrapd = "nav.bin.snmptrapd:main"
 sortedstats_cacher = "nav.bin.sortedstats_cacher:main"
 start_arnold = "nav.bin.start_arnold:main"
 t1000 = "nav.bin.t1000:main"
diff --git a/python/nav/etc/daemons.yml b/python/nav/etc/daemons.yml
index 59188497ae..f821aaf220 100644
--- a/python/nav/etc/daemons.yml
+++ b/python/nav/etc/daemons.yml
@@ -28,5 +28,5 @@ daemons:
 
     snmptrapd:
         description: Receives and processes SNMP traps and notifications.
-        command: snmptrapd
+        command: navtrapd
         privileged: true