diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index 0afc0e4758d9..e6418cf5fd89 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -1,12 +1,12 @@
 # Created by: Simon Barner <barner@gmx.de>
 
 PORTNAME=	valgrind
-PORTVERSION=	3.17.0.g20210319
-DISTVERSIONPREFIX=	freebsd-
+PORTVERSION=	3.18.1
+#DISTVERSIONPREFIX=	freebsd-
 PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	https://valgrind.org/
+MASTER_SITES=	SOURCEWARE/valgrind
 
 MAINTAINER=	pjfloyd@wanadoo.fr
 COMMENT=	Memory debugging and profiling tool
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES=		cpe pathfix pkgconfig gmake perl5 shebangfix autoreconf
+USES=		cpe pathfix pkgconfig gmake perl5 shebangfix autoreconf tar:bz2
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
@@ -24,12 +24,12 @@ SHEBANG_FILES=	callgrind/callgrind_annotate.in callgrind/callgrind_control.in
 SSP_UNSAFE=	yes
 LIB32_PATH?=	/usr/lib32/libc.so
 
-CONFLICTS=	valgrind-[0-9]*
+CONFLICTS=	valgrind-devel-[0-9]*
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	paulfloyd
-GH_PROJECT=	freebsd_valgrind
-GH_TAGNAME=	d333c54
+#USE_GITHUB=	yes
+#GH_ACCOUNT=	paulfloyd
+#GH_PROJECT=	freebsd_valgrind
+#GH_TAGNAME=	d333c54
 
 CONFIGURE_ENV+=	ac_cv_path_PERL=${PERL}
 
diff --git a/devel/valgrind/distinfo b/devel/valgrind/distinfo
index c7364c85ea6f..03634cf9998b 100644
--- a/devel/valgrind/distinfo
+++ b/devel/valgrind/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616493211
-SHA256 (paulfloyd-freebsd_valgrind-freebsd-3.17.0.g20210319-d333c54_GH0.tar.gz) = 2f631d7768fda08a62d6327cea0ea56062becad0083ba2751262215c2390387e
-SIZE (paulfloyd-freebsd_valgrind-freebsd-3.17.0.g20210319-d333c54_GH0.tar.gz) = 15796240
+TIMESTAMP = 1634460994
+SHA256 (valgrind-3.18.1.tar.bz2) = 00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5
+SIZE (valgrind-3.18.1.tar.bz2) = 16149159
diff --git a/devel/valgrind/pkg-descr b/devel/valgrind/pkg-descr
index 8a88d8b1cf4e..ae6db068ded1 100644
--- a/devel/valgrind/pkg-descr
+++ b/devel/valgrind/pkg-descr
@@ -16,5 +16,4 @@ The Valgrind distribution includes 10 tools:
 
 Valgrind was initially ported to FreeBSD by Doug Rabson.
 
-WWW: https://github.com/paulfloyd/freebsd_valgrind
 WWW: http://www.valgrind.org/
diff --git a/devel/valgrind/pkg-message b/devel/valgrind/pkg-message
deleted file mode 100644
index 999db08e752f..000000000000
--- a/devel/valgrind/pkg-message
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-	Known problems:
-	1) DRD/Helgrind tool gives excessive false-positivies for the
-	   internals of pthreads library.  This is now under
-	   investigation.
-	2) exp-ptrcheck tool doesn't work on FreeBSD now
-
-	If you'll encounter any problems when using Valgrind do not
-	hesitate to contact the maintainer with the description of
-	these problems.
-EOM
-}
-]