diff --git a/devel/libcwd/Makefile b/devel/libcwd/Makefile
index 1db83633bd19..cb118862a073 100644
--- a/devel/libcwd/Makefile
+++ b/devel/libcwd/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libcwd
-PORTVERSION=	0.99.39
-PORTREVISION=	1
+PORTVERSION=	0.99.40
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -39,5 +38,7 @@ post-patch:
 	@${REINPLACE_CMD} -E -e 's,\$$\(libdir\)/(pkgconfig),${PREFIX}/libdata/\1,g' \
 		${WRKSRC}/${MAKEFILE}.in
 	@${REINPLACE_CMD} -e 's,Elf32_Off,uint32_t,g' ${WRKSRC}/bfd.cc
+	@${REINPLACE_CMD} -e 's|--tag=CXX||g' ${WRKSRC}/${MAKEFILE}.in \
+		${WRKSRC}/utils/${MAKEFILE}.in
 
 .include <bsd.port.post.mk>
diff --git a/devel/libcwd/distinfo b/devel/libcwd/distinfo
index 486942e7ebfd..857e9e091d17 100644
--- a/devel/libcwd/distinfo
+++ b/devel/libcwd/distinfo
@@ -1,2 +1,2 @@
-MD5 (libcwd-0.99.39.tar.gz) = d337c4783d2e9343fbcbf3533db8809f
-SIZE (libcwd-0.99.39.tar.gz) = 1251627
+MD5 (libcwd-0.99.40.tar.gz) = 91d055ed1c6e5d47a74c9d49f314a690
+SIZE (libcwd-0.99.40.tar.gz) = 1241873