diff --git a/devel/reposurgeon/Makefile b/devel/reposurgeon/Makefile
index 314677b5ef85c..2d51a7e175893 100644
--- a/devel/reposurgeon/Makefile
+++ b/devel/reposurgeon/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2017/01/01 14:43:36 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2017/01/21 12:07:28 kim Exp $
 
-DISTNAME=	reposurgeon-3.29
+DISTNAME=	reposurgeon-3.40
 CATEGORIES=	devel scm
 MASTER_SITES=	http://www.catb.org/~esr/reposurgeon/
 EXTRACT_SUFX=	.tar.xz
@@ -18,7 +18,7 @@ USE_LANGUAGES=	# none
 MAKE_FLAGS+=	prefix=${PREFIX}
 MAKE_FLAGS+=	mandir=${PKGMANDIR}
 
-REPLACE_PYTHON=	repodiffer reposurgeon
+REPLACE_PYTHON=	repocutter repodiffer repomapper reposurgeon
 REPLACE_SH=	repotool
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # 3.26 uses commands module, which is deprecated in python-3.x
diff --git a/devel/reposurgeon/PLIST b/devel/reposurgeon/PLIST
index 5cd62abdfa2c6..242bc014b1e75 100644
--- a/devel/reposurgeon/PLIST
+++ b/devel/reposurgeon/PLIST
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2015/09/16 16:13:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/01/21 12:07:28 kim Exp $
+bin/repocutter
 bin/repodiffer
+bin/repomapper
 bin/reposurgeon
 bin/repotool
+man/man1/repocutter.1
 man/man1/repodiffer.1
 man/man1/repomapper.1
 man/man1/reposurgeon.1
@@ -11,6 +14,7 @@ share/doc/reposurgeon/README.md
 share/doc/reposurgeon/TODO
 share/doc/reposurgeon/dvcs-migration-guide.html
 share/doc/reposurgeon/features.html
+share/doc/reposurgeon/repocutter.html
 share/doc/reposurgeon/repodiffer.html
 share/doc/reposurgeon/repomapper.html
 share/doc/reposurgeon/reporting-bugs.html
diff --git a/devel/reposurgeon/distinfo b/devel/reposurgeon/distinfo
index 1fcc1dbf61aa3..6f66d46decdf5 100644
--- a/devel/reposurgeon/distinfo
+++ b/devel/reposurgeon/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2015/11/03 03:29:19 agc Exp $
+$NetBSD: distinfo,v 1.19 2017/01/21 12:07:28 kim Exp $
 
-SHA1 (reposurgeon-3.29.tar.xz) = 980855a019b18b717ecc328259e9e3ca52f3700a
-RMD160 (reposurgeon-3.29.tar.xz) = f9f9f259d5db981e8a6f605642ce45d37a8dc575
-SHA512 (reposurgeon-3.29.tar.xz) = 5598d7c4a055c92b0d1f37dc4c9e2e1504862830a105633b2f264c8e0fb266ca13ac1e854df971ba0d037ca5773ec2b6d7fcdf6028d385ec68168c2fcc3c8733
-Size (reposurgeon-3.29.tar.xz) = 168360 bytes
+SHA1 (reposurgeon-3.40.tar.xz) = 94ba2f37c0210d5a5faa4b2a6c4844c994136f45
+RMD160 (reposurgeon-3.40.tar.xz) = 7e404fff44e392ac87d00beb7410f3cad4f47577
+SHA512 (reposurgeon-3.40.tar.xz) = 037e2cce94a4553f8ce4663ecaa376dd5da3ea127cad11686213510cc3d67e1cb0c64b4b9dbe1930a35a2753e88925a0b5fab4253b7f964da30c487e47020c38
+Size (reposurgeon-3.40.tar.xz) = 502804 bytes