diff --git a/education/algotutor/Makefile b/education/algotutor/Makefile
index 27ce3d0813e..1cf99b53969 100644
--- a/education/algotutor/Makefile
+++ b/education/algotutor/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.15 2019/07/12 20:46:07 sthen Exp $
-
 COMMENT=	interactive tutorial for algorithms and data structures
 
 DISTNAME=	algotutor-0.8.6
diff --git a/education/algotutor/patches/patch-algotutor b/education/algotutor/patches/patch-algotutor
index 0d93a0fd928..79e21795521 100644
--- a/education/algotutor/patches/patch-algotutor
+++ b/education/algotutor/patches/patch-algotutor
@@ -1,4 +1,3 @@
-$OpenBSD: patch-algotutor,v 1.3 2008/12/21 11:51:02 kevlo Exp $
 --- algotutor.orig	Mon Apr  9 14:56:08 2007
 +++ algotutor	Sun Dec 21 19:22:54 2008
 @@ -4,7 +4,7 @@
diff --git a/education/algotutor/pkg/PLIST b/education/algotutor/pkg/PLIST
index 18677f170fc..528510d17ea 100644
--- a/education/algotutor/pkg/PLIST
+++ b/education/algotutor/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2008/12/21 11:51:02 kevlo Exp $
 bin/algotutor
 bin/gen_at_graph
 ${P5SITE}/algotutor/
diff --git a/education/anki/Makefile b/education/anki/Makefile
index 611b69b54ee..7379edd10b8 100644
--- a/education/anki/Makefile
+++ b/education/anki/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.25 2021/11/02 00:01:13 sthen Exp $
-
 COMMENT =	flashcard learning system with spaced repetition
 DISTNAME =	anki-2.1.16
 EXTRACT_SUFX =	-source.tgz
diff --git a/education/anki/patches/patch-anki_mpv_py b/education/anki/patches/patch-anki_mpv_py
index fd0cd933638..3f7d290179d 100644
--- a/education/anki/patches/patch-anki_mpv_py
+++ b/education/anki/patches/patch-anki_mpv_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-anki_mpv_py,v 1.1 2020/06/16 22:18:46 sthen Exp $
-
 Index: anki/mpv.py
 --- anki/mpv.py.orig
 +++ anki/mpv.py
diff --git a/education/anki/patches/patch-anki_utils_py b/education/anki/patches/patch-anki_utils_py
index 72d382605e0..c335d7c3191 100644
--- a/education/anki/patches/patch-anki_utils_py
+++ b/education/anki/patches/patch-anki_utils_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-anki_utils_py,v 1.1 2020/06/16 22:18:46 sthen Exp $
-
 Index: anki/utils.py
 --- anki/utils.py.orig
 +++ anki/utils.py
diff --git a/education/anki/patches/patch-aqt_mediasrv_py b/education/anki/patches/patch-aqt_mediasrv_py
index ec377951dee..0c571ba9977 100644
--- a/education/anki/patches/patch-aqt_mediasrv_py
+++ b/education/anki/patches/patch-aqt_mediasrv_py
@@ -1,5 +1,3 @@
-$OpenBSD: patch-aqt_mediasrv_py,v 1.1 2020/06/16 22:18:46 sthen Exp $
-
 Index: aqt/mediasrv.py
 --- aqt/mediasrv.py.orig
 +++ aqt/mediasrv.py
diff --git a/education/anki/pkg/PLIST b/education/anki/pkg/PLIST
index b14ea90b715..db9a221d0a9 100644
--- a/education/anki/pkg/PLIST
+++ b/education/anki/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.8 2020/06/16 22:18:46 sthen Exp $
 bin/anki
 lib/python${MODPY_VERSION}/site-packages/anki/
 lib/python${MODPY_VERSION}/site-packages/anki/__init__.py
diff --git a/education/drgeo-doc/Makefile b/education/drgeo-doc/Makefile
index 0ee7153734a..15e9fc2ef56 100644
--- a/education/drgeo-doc/Makefile
+++ b/education/drgeo-doc/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.8 2019/07/12 20:46:07 sthen Exp $
-
 COMMENT=	interactive geometry program, documentation
 
 DISTNAME=	drgeo-doc-1.6
diff --git a/education/drgeo-doc/pkg/PLIST b/education/drgeo-doc/pkg/PLIST
index ef4dfb3c099..f10bee75b0c 100644
--- a/education/drgeo-doc/pkg/PLIST
+++ b/education/drgeo-doc/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2005/11/11 20:24:48 wilfried Exp $
 share/drgeo/
 share/drgeo/help/
 share/drgeo/help/c/
diff --git a/education/drgeo/Makefile b/education/drgeo/Makefile
index c9ce8e1426b..4617723a191 100644
--- a/education/drgeo/Makefile
+++ b/education/drgeo/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.46 2019/07/12 20:46:07 sthen Exp $
-
 COMMENT=	interactive geometry program
 
 DISTNAME=	drgeo-1.1.0
diff --git a/education/drgeo/patches/patch-Makefile_in b/education/drgeo/patches/patch-Makefile_in
index 153db0de58a..18a45881a49 100644
--- a/education/drgeo/patches/patch-Makefile_in
+++ b/education/drgeo/patches/patch-Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2005/11/11 20:23:53 wilfried Exp $
 --- Makefile.in.orig	Wed Jul 27 09:36:20 2005
 +++ Makefile.in	Fri Nov  4 13:55:44 2005
 @@ -182,7 +182,7 @@ helpdir = $(datadir)/drgeo/help
diff --git a/education/drgeo/patches/patch-drgeo_adaptDialog_cc b/education/drgeo/patches/patch-drgeo_adaptDialog_cc
index 45b4de84d38..c67bffb2e7a 100644
--- a/education/drgeo/patches/patch-drgeo_adaptDialog_cc
+++ b/education/drgeo/patches/patch-drgeo_adaptDialog_cc
@@ -1,4 +1,3 @@
-$OpenBSD: patch-drgeo_adaptDialog_cc,v 1.2 2004/08/02 07:13:06 kevlo Exp $
 --- drgeo_adaptDialog.cc.orig	Sun Jun  6 17:30:06 2004
 +++ drgeo_adaptDialog.cc	Mon Aug  2 14:36:10 2004
 @@ -34,7 +34,11 @@
diff --git a/education/drgeo/patches/patch-examples_figures_Makefile_in b/education/drgeo/patches/patch-examples_figures_Makefile_in
index 39592411b8f..0fc64cb3087 100644
--- a/education/drgeo/patches/patch-examples_figures_Makefile_in
+++ b/education/drgeo/patches/patch-examples_figures_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-examples_figures_Makefile_in,v 1.1 2005/11/11 20:23:53 wilfried Exp $
 --- examples/figures/Makefile.in.orig	Fri Nov  4 13:33:10 2005
 +++ examples/figures/Makefile.in	Fri Nov  4 13:33:31 2005
 @@ -178,7 +178,7 @@ sbindir = @sbindir@
diff --git a/education/drgeo/patches/patch-examples_macro_Makefile_in b/education/drgeo/patches/patch-examples_macro_Makefile_in
index a9d6b2ed48e..094d73b48ff 100644
--- a/education/drgeo/patches/patch-examples_macro_Makefile_in
+++ b/education/drgeo/patches/patch-examples_macro_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-examples_macro_Makefile_in,v 1.1 2005/11/11 20:23:53 wilfried Exp $
 --- examples/macro/Makefile.in.orig	Fri Nov  4 13:33:37 2005
 +++ examples/macro/Makefile.in	Fri Nov  4 13:33:44 2005
 @@ -178,7 +178,7 @@ sbindir = @sbindir@
diff --git a/education/drgeo/patches/patch-examples_scheme_Makefile_in b/education/drgeo/patches/patch-examples_scheme_Makefile_in
index 73409a06cfa..884083cc03f 100644
--- a/education/drgeo/patches/patch-examples_scheme_Makefile_in
+++ b/education/drgeo/patches/patch-examples_scheme_Makefile_in
@@ -1,4 +1,3 @@
-$OpenBSD: patch-examples_scheme_Makefile_in,v 1.1 2005/11/11 20:23:53 wilfried Exp $
 --- examples/scheme/Makefile.in.orig	Fri Nov  4 13:33:53 2005
 +++ examples/scheme/Makefile.in	Fri Nov  4 13:34:01 2005
 @@ -178,7 +178,7 @@ sbindir = @sbindir@
diff --git a/education/drgeo/patches/patch-geo_drgeo_dialog_cc b/education/drgeo/patches/patch-geo_drgeo_dialog_cc
index f6ea0313adc..61ee155d572 100644
--- a/education/drgeo/patches/patch-geo_drgeo_dialog_cc
+++ b/education/drgeo/patches/patch-geo_drgeo_dialog_cc
@@ -1,4 +1,3 @@
-$OpenBSD: patch-geo_drgeo_dialog_cc,v 1.1 2017/05/04 19:45:27 espie Exp $
 Modern C++ doesn't want to give external linkage to anonymous structs
 Index: geo/drgeo_dialog.cc
 --- geo/drgeo_dialog.cc.orig
diff --git a/education/drgeo/patches/patch-geo_drgeo_figure_cc b/education/drgeo/patches/patch-geo_drgeo_figure_cc
index 55219c12f19..57f39728aa3 100644
--- a/education/drgeo/patches/patch-geo_drgeo_figure_cc
+++ b/education/drgeo/patches/patch-geo_drgeo_figure_cc
@@ -1,5 +1,3 @@
-$OpenBSD: patch-geo_drgeo_figure_cc,v 1.2 2017/05/04 19:45:27 espie Exp $
-
 Index: geo/drgeo_figure.cc
 --- geo/drgeo_figure.cc.orig
 +++ geo/drgeo_figure.cc
diff --git a/education/drgeo/patches/patch-geo_drgeo_postscriptdrawable_cc b/education/drgeo/patches/patch-geo_drgeo_postscriptdrawable_cc
index 15813411053..657bb44d621 100644
--- a/education/drgeo/patches/patch-geo_drgeo_postscriptdrawable_cc
+++ b/education/drgeo/patches/patch-geo_drgeo_postscriptdrawable_cc
@@ -1,5 +1,3 @@
-$OpenBSD: patch-geo_drgeo_postscriptdrawable_cc,v 1.1 2018/04/11 20:30:32 naddy Exp $
-
 Index: geo/drgeo_postscriptdrawable.cc
 --- geo/drgeo_postscriptdrawable.cc.orig
 +++ geo/drgeo_postscriptdrawable.cc
diff --git a/education/drgeo/pkg/PLIST b/education/drgeo/pkg/PLIST
index 5069c49a395..5023d450082 100644
--- a/education/drgeo/pkg/PLIST
+++ b/education/drgeo/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.8 2018/06/27 21:03:42 espie Exp $
 @bin bin/drgeo
 share/applications/drgeo.desktop
 share/drgeo/
diff --git a/education/dvorak7min/Makefile b/education/dvorak7min/Makefile
index 8246df9e4cc..91e0ca8fa22 100644
--- a/education/dvorak7min/Makefile
+++ b/education/dvorak7min/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.15 2020/01/26 11:14:31 jasper Exp $
-
 COMMENT=	typing tutor for dvorak keyboards
 
 DISTNAME=	dvorak7min-1.6.1
diff --git a/education/dvorak7min/pkg/PLIST b/education/dvorak7min/pkg/PLIST
index d49e7563de6..0e6128641a4 100644
--- a/education/dvorak7min/pkg/PLIST
+++ b/education/dvorak7min/pkg/PLIST
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST,v 1.2 2010/01/12 19:13:39 jasper Exp $
 @bin bin/dvorak7min
diff --git a/education/epte/Makefile b/education/epte/Makefile
index 78e7536117d..bb8d8724f46 100644
--- a/education/epte/Makefile
+++ b/education/epte/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2021/02/01 17:40:49 kn Exp $
-
 COMMENT=		electronic periodic table of the elements
 
 DISTNAME=		epte-2.0.8
diff --git a/education/epte/patches/patch-do_constants_c b/education/epte/patches/patch-do_constants_c
index c582baebb14..ff86b1e4678 100644
--- a/education/epte/patches/patch-do_constants_c
+++ b/education/epte/patches/patch-do_constants_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-do_constants_c,v 1.1.1.1 2010/08/23 09:31:23 ajacoutot Exp $
 --- do_constants.c.orig	Mon Aug 23 07:47:28 2010
 +++ do_constants.c	Mon Aug 23 07:47:40 2010
 @@ -290,6 +290,7 @@ modification follow.
diff --git a/education/epte/patches/patch-do_conversion_c b/education/epte/patches/patch-do_conversion_c
index 5f4fba178c0..dce90fa1d38 100644
--- a/education/epte/patches/patch-do_conversion_c
+++ b/education/epte/patches/patch-do_conversion_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-do_conversion_c,v 1.1.1.1 2010/08/23 09:31:23 ajacoutot Exp $
 --- do_conversion.c.orig	Mon Aug 23 07:50:25 2010
 +++ do_conversion.c	Mon Aug 23 07:50:46 2010
 @@ -292,6 +292,7 @@ modification follow.
diff --git a/education/epte/patches/patch-do_element_c b/education/epte/patches/patch-do_element_c
index d93f59baa66..bd9ae590e72 100644
--- a/education/epte/patches/patch-do_element_c
+++ b/education/epte/patches/patch-do_element_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-do_element_c,v 1.1.1.1 2010/08/23 09:31:23 ajacoutot Exp $
 --- do_element.c.orig	Mon Aug 23 07:51:01 2010
 +++ do_element.c	Mon Aug 23 07:51:25 2010
 @@ -290,6 +290,8 @@ modification follow.
diff --git a/education/epte/patches/patch-do_help_c b/education/epte/patches/patch-do_help_c
index 73970b44838..f2055389098 100644
--- a/education/epte/patches/patch-do_help_c
+++ b/education/epte/patches/patch-do_help_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-do_help_c,v 1.1.1.1 2010/08/23 09:31:23 ajacoutot Exp $
 --- do_help.c.orig	Mon Aug 23 07:49:59 2010
 +++ do_help.c	Mon Aug 23 07:50:13 2010
 @@ -293,6 +293,8 @@ modification follow.
diff --git a/education/epte/patches/patch-do_radii_c b/education/epte/patches/patch-do_radii_c
index beb88d6cf73..525c64efba8 100644
--- a/education/epte/patches/patch-do_radii_c
+++ b/education/epte/patches/patch-do_radii_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-do_radii_c,v 1.1.1.1 2010/08/23 09:31:23 ajacoutot Exp $
 --- do_radii.c.orig	Mon Aug 23 07:53:31 2010
 +++ do_radii.c	Mon Aug 23 07:53:52 2010
 @@ -290,6 +290,8 @@ modification follow.
diff --git a/education/epte/patches/patch-endprog_c b/education/epte/patches/patch-endprog_c
index 6701ac45a72..a568c11625d 100644
--- a/education/epte/patches/patch-endprog_c
+++ b/education/epte/patches/patch-endprog_c
@@ -1,5 +1,3 @@
-$OpenBSD: patch-endprog_c,v 1.1 2021/02/01 17:40:49 kn Exp $
-
 Fix "-fno-common" build.
 
 Index: endprog.c
diff --git a/education/epte/patches/patch-epte_1 b/education/epte/patches/patch-epte_1
index 766e3d5143e..a40f39b6588 100644
--- a/education/epte/patches/patch-epte_1
+++ b/education/epte/patches/patch-epte_1
@@ -1,4 +1,3 @@
-$OpenBSD: patch-epte_1,v 1.1.1.1 2010/08/23 09:31:23 ajacoutot Exp $
 --- epte.1.orig	Mon Aug 23 07:55:55 2010
 +++ epte.1	Mon Aug 23 07:57:56 2010
 @@ -38,14 +38,11 @@ Do not display the periodic table with element focus.
diff --git a/education/epte/patches/patch-fill_information_c b/education/epte/patches/patch-fill_information_c
index 695e6aa56c9..c3bd9337036 100644
--- a/education/epte/patches/patch-fill_information_c
+++ b/education/epte/patches/patch-fill_information_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-fill_information_c,v 1.1.1.1 2010/08/23 09:31:23 ajacoutot Exp $
 --- fill_information.c.orig	Mon Aug 23 07:45:28 2010
 +++ fill_information.c	Mon Aug 23 07:45:44 2010
 @@ -290,6 +290,8 @@ modification follow.
diff --git a/education/epte/patches/patch-makefile b/education/epte/patches/patch-makefile
index 15af9936c90..f6eeb909fb6 100644
--- a/education/epte/patches/patch-makefile
+++ b/education/epte/patches/patch-makefile
@@ -1,4 +1,3 @@
-$OpenBSD: patch-makefile,v 1.1.1.1 2010/08/23 09:31:23 ajacoutot Exp $
 --- makefile.orig	Wed Apr  7 21:06:02 1999
 +++ makefile	Mon Aug 23 07:53:15 2010
 @@ -320,13 +320,13 @@ IS_INTERACTIVE= yes
diff --git a/education/epte/patches/patch-periodic_h b/education/epte/patches/patch-periodic_h
index ffa9cf7cbda..0a057e59b4c 100644
--- a/education/epte/patches/patch-periodic_h
+++ b/education/epte/patches/patch-periodic_h
@@ -1,4 +1,3 @@
-$OpenBSD: patch-periodic_h,v 1.1.1.1 2010/08/23 09:31:23 ajacoutot Exp $
 --- periodic.h.orig	Sat Aug 14 22:55:52 2010
 +++ periodic.h	Sat Aug 14 22:56:09 2010
 @@ -296,7 +296,7 @@ modification follow.
diff --git a/education/epte/patches/patch-setaudio_c b/education/epte/patches/patch-setaudio_c
index a4dae6278e7..6721225afd2 100644
--- a/education/epte/patches/patch-setaudio_c
+++ b/education/epte/patches/patch-setaudio_c
@@ -1,4 +1,3 @@
-$OpenBSD: patch-setaudio_c,v 1.1.1.1 2010/08/23 09:31:23 ajacoutot Exp $
 --- setaudio.c.orig	Wed Apr  7 22:06:21 1999
 +++ setaudio.c	Mon Aug 23 07:59:21 2010
 @@ -292,6 +292,7 @@ modification follow.
diff --git a/education/epte/pkg/PLIST b/education/epte/pkg/PLIST
index b114aa903d2..80bc1c06c6e 100644
--- a/education/epte/pkg/PLIST
+++ b/education/epte/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2010/08/23 09:31:23 ajacoutot Exp $
 @bin bin/epte
 @man man/man1/epte.1
diff --git a/education/gamgi/Makefile b/education/gamgi/Makefile
index 9437072d5e5..9e73a1c2516 100755
--- a/education/gamgi/Makefile
+++ b/education/gamgi/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.23 2021/02/20 19:42:07 kn Exp $
-
 COMMENT=		General Atomistic Modelling Graphic Interface
 
 V=			0.17.3g
diff --git a/education/gamgi/patches/patch-src-make_local b/education/gamgi/patches/patch-src-make_local
index 58f92f83f9f..537f27221e4 100644
--- a/education/gamgi/patches/patch-src-make_local
+++ b/education/gamgi/patches/patch-src-make_local
@@ -1,5 +1,3 @@
-$OpenBSD: patch-src-make_local,v 1.8 2021/02/20 19:35:41 kn Exp $
-
 Set include and library paths.
 
 Index: src/make_local
diff --git a/education/gamgi/patches/patch-src-make_rules b/education/gamgi/patches/patch-src-make_rules
index 3628bbeb3e3..6e19f3db33a 100644
--- a/education/gamgi/patches/patch-src-make_rules
+++ b/education/gamgi/patches/patch-src-make_rules
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src-make_rules,v 1.9 2021/02/20 19:35:41 kn Exp $
 Index: src/make_rules
 --- src/make_rules.orig
 +++ src/make_rules
diff --git a/education/gamgi/patches/patch-src_io_gamgi_io_h b/education/gamgi/patches/patch-src_io_gamgi_io_h
index ede08eca3c9..b33dd4d44da 100644
--- a/education/gamgi/patches/patch-src_io_gamgi_io_h
+++ b/education/gamgi/patches/patch-src_io_gamgi_io_h
@@ -1,4 +1,3 @@
-$OpenBSD: patch-src_io_gamgi_io_h,v 1.2 2010/01/16 22:01:29 matthieu Exp $
 --- src/io/gamgi_io.h.orig	Wed Dec 16 17:51:05 2009
 +++ src/io/gamgi_io.h	Wed Dec 16 17:51:07 2009
 @@ -230,7 +230,7 @@ GAMGI_IO_DEJAVU_MONO_ITALIC, GAMGI_IO_DEJAVU_MONO_BOLD
diff --git a/education/gamgi/pkg/PLIST b/education/gamgi/pkg/PLIST
index 0da37272055..6c7f04c2530 100644
--- a/education/gamgi/pkg/PLIST
+++ b/education/gamgi/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.8 2021/02/20 19:35:41 kn Exp $
 @bin bin/gamgi
 share/doc/gamgi/
 share/doc/gamgi/LICENSE