diff --git a/cad/ghdl/Makefile b/cad/ghdl/Makefile
index def164fbec92..fa9dce0f7484 100644
--- a/cad/ghdl/Makefile
+++ b/cad/ghdl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ghdl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.0-20230222
+DISTVERSION=	3.0.0
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -21,7 +21,6 @@ SHEBANG_FILES=	testsuite/testsuite.sh
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
-GH_TAGNAME=	7670533
 
 GNU_CONFIGURE=	yes
 
diff --git a/cad/ghdl/distinfo b/cad/ghdl/distinfo
index d18e136b6b1e..6fddddd79608 100644
--- a/cad/ghdl/distinfo
+++ b/cad/ghdl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1677185255
-SHA256 (ghdl-ghdl-v2.0.0-20230222-7670533_GH0.tar.gz) = d0bd40ad1d5ffc51300e1fc8248f12621333376230defd79793b9454469b359d
-SIZE (ghdl-ghdl-v2.0.0-20230222-7670533_GH0.tar.gz) = 7196702
+TIMESTAMP = 1678325963
+SHA256 (ghdl-ghdl-v3.0.0_GH0.tar.gz) = c1ed4d2095df80131260a48c55bb53409ce8d4c38bba42618ca040115faf08b9
+SIZE (ghdl-ghdl-v3.0.0_GH0.tar.gz) = 7160245
diff --git a/cad/ghdl/files/patch-testsuite_testsuite.sh b/cad/ghdl/files/patch-testsuite_testsuite.sh
index 7cc9ac1e91aa..41f7a88c79a7 100644
--- a/cad/ghdl/files/patch-testsuite_testsuite.sh
+++ b/cad/ghdl/files/patch-testsuite_testsuite.sh
@@ -7,7 +7,7 @@
  done
  
 -if [ "x$tests" = "x" ]; then tests="sanity pyunit gna vests synth vpi vhpi"; fi
-+if [ "x$tests" = "x" ]; then tests="sanity gna vests synth vpi vhpi"; fi
++if [ "x$tests" = "x" ]; then tests="sanity        gna vests synth vpi vhpi"; fi
  
  echo "> tests: $tests"
  echo "> args: $@"