diff --git a/manpages/conf.py b/manpages/conf.py
index cd318c1..95c4f8d 100644
--- a/manpages/conf.py
+++ b/manpages/conf.py
@@ -7,7 +7,7 @@
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
 project = 'NDN Essential Tools'
-copyright = 'Copyright © 2014-2024 Named Data Networking Project.'
+copyright = 'Copyright © 2014-2025 Named Data Networking Project.'
 author = 'Named Data Networking Project'
 
 # The short X.Y version.
@@ -39,11 +39,11 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
+    ('ndn-dissect',   'ndn-dissect',   'NDN packet format inspector',                [], 1),
+    ('ndndump',       'ndndump',       'traffic analysis tool',                      [], 8),
     ('ndnpeek',       'ndnpeek',       'simple consumer to send one Interest and receive one Data', [], 1),
     ('ndnpoke',       'ndnpoke',       'simple producer to publish one Data',        [], 1),
     ('ndnping',       'ndnping',       'reachability testing client',                [], 1),
     ('ndnpingserver', 'ndnpingserver', 'reachability testing server',                [], 1),
-    ('ndnputchunks',  'ndnputchunks',  'producer program with content segmentation', [], 1),
-    ('ndndump',       'ndndump',       'traffic analysis tool',                      [], 8),
-    ('ndn-dissect',   'ndn-dissect',   'NDN packet format inspector',                [], 1),
+    ('ndnserve',      'ndnserve',      'producer program with content segmentation', [], 1),
 ]
diff --git a/manpages/ndnputchunks.rst b/manpages/ndnserve.rst
similarity index 87%
rename from manpages/ndnputchunks.rst
rename to manpages/ndnserve.rst
index f002a78..d8c2df5 100644
--- a/manpages/ndnputchunks.rst
+++ b/manpages/ndnserve.rst
@@ -1,15 +1,15 @@
-ndnputchunks
-============
+ndnserve
+========
 
 Synopsis
 --------
 
-**ndnputchunks** [*option*]... *name*
+**ndnserve** [*option*]... *name*
 
 Description
 -----------
 
-:program:`ndnputchunks` is a producer program that reads a file from the standard input
+:program:`ndnserve` is a producer program that reads a file from the standard input
 and makes it available as NDN Data segments.
 
 Version and segment number components are appended to the specified *name* as needed,
@@ -77,11 +77,11 @@
 The following command will publish the text of the GPL-3 license under the ``/localhost/demo/gpl3``
 prefix::
 
-    ndnputchunks /localhost/demo/gpl3 < /usr/share/common-licenses/GPL-3
+    ndnserve /localhost/demo/gpl3 < /usr/share/common-licenses/GPL-3
 
 To see the published version, you can run the program with the **-p** option::
 
-    ndnputchunks -p /localhost/demo/gpl3 < /usr/share/common-licenses/GPL-3
+    ndnserve -p /localhost/demo/gpl3 < /usr/share/common-licenses/GPL-3
 
 This command will print the published version to the standard output.
 
@@ -90,7 +90,7 @@
 For example, the following command will publish version 1615519151142 of ``/localhost/demo/gpl3``
 using the "typed" naming convention::
 
-    ndnputchunks -Nt /localhost/demo/gpl3/v=1615519151142 < /usr/share/common-licenses/GPL-3
+    ndnserve -Nt /localhost/demo/gpl3/v=1615519151142 < /usr/share/common-licenses/GPL-3
 
 See Also
 --------