diff --git a/buildfiles/brew/apg-go.rb b/buildfiles/brew/apg-go.rb
new file mode 100644
index 0000000..7318466
--- /dev/null
+++ b/buildfiles/brew/apg-go.rb
@@ -0,0 +1,17 @@
+class ApgGo < Formula
+  desc "\"Automated Password Generator\"-clone written in Go"
+  homepage "https://github.com/wneessen/apg-go/"
+  url "https://github.com/wneessen/apg-go/archive/refs/tags/v0.3.1.tar.gz"
+  sha256 "1a798bd729c2985a11001118ad7d222e75c4f01e642184c37dec409a899a565b"
+  license "MIT"
+
+  depends_on "go" => :build
+
+  def install
+    system "go", "build", *std_go_args
+  end
+
+  test do
+    system "go", "test", "github.com/wneessen/apg-go"
+  end
+end
diff --git a/buildfiles/openbsd/Makefile b/buildfiles/openbsd/Makefile
index 79f910b..ac25397 100644
--- a/buildfiles/openbsd/Makefile
+++ b/buildfiles/openbsd/Makefile
@@ -1,38 +1,21 @@
-COMMENT =		"automated password generator" clone written in Go
+# $OpenBSD$
 
-V =			0.3.1
+COMMENT =               "automated password generator" clone written in Go
 
-DISTNAME =		v$V
+GH_ACCOUNT =            wneessen
+GH_PROJECT =            apg-go
+GH_TAGNAME =            v0.3.1
 
-REVISION =		1
+CATEGORIES =            security
 
-PKGNAME =		apg-go-$V
-
-CATEGORIES =		security
-
-HOMEPAGE =		https://github.com/wneessen/apg-go
-
-MAINTAINER =		Winni Neessen <wn@neessen.net>
-
-MASTER_SITES =		https://github.com/wneessen/apg-go/archive/refs/tags/
+MAINTAINER =            Winni Neessen <wn@neessen.net>
 
 # MIT
-PERMIT_PACKAGE =	Yes
+PERMIT_PACKAGE =        Yes
 
-MODULES =		lang/go
-MODGO_TYPE =		bin
+MODULES =               lang/go
+MODGO_TYPE =            bin
 
-ALL_TARGET =		wneessen/apg-go
+ALL_TARGET =            wneessen/apg-go
 
-post-extract:
-	mv ${WRKDIR}/${PKGNAME} ${WRKDIR}/${DISTNAME}
-
-test:
-	cd ${WRKDIR} && ${MODGO_CMD} test ${ALL_TARGET}
-
-build:
-	mkdir -p ${MODGO_WORKSPACE}/bin
-	cd ${WRKDIR} && ${MODGO_CMD} build \
-		-o ${MODGO_WORKSPACE}/bin ${ALL_TARGET}
-
-.include <bsd.port.mk>
+.include <bsd.port.mk>
\ No newline at end of file
diff --git a/buildfiles/openbsd/distinfo b/buildfiles/openbsd/distinfo
index b1c8698..35a07f0 100644
--- a/buildfiles/openbsd/distinfo
+++ b/buildfiles/openbsd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (v0.3.1.tar.gz) = 1a798bd729c2985a11001118ad7d222e75c4f01e642184c37dec409a899a565b
-SIZE (v0.3.1.tar.gz) = 16576
+SHA256 (apg-go-0.3.1.tar.gz) = GnmL1ynCmFoRABEYrX0iLnXE8B5kIYTDfexAmomaVls=
+SIZE (apg-go-0.3.1.tar.gz) = 16576
diff --git a/buildfiles/openbsd/pkg/DESCR b/buildfiles/openbsd/pkg/DESCR
index 3edfc29..0a6857e 100644
--- a/buildfiles/openbsd/pkg/DESCR
+++ b/buildfiles/openbsd/pkg/DESCR
@@ -11,4 +11,4 @@ no use in replicating that feature. Therfore apg-go does not support
 pronouncable passwords.
 
 For feature requests or bug reports, please create an issue in the Github
-repository at https://github.com/wneessen/apg-go
+repository at https://github.com/wneessen/apg-go
\ No newline at end of file
diff --git a/buildfiles/openbsd/pkg/PLIST b/buildfiles/openbsd/pkg/PLIST
index baa862a..0b10474 100644
--- a/buildfiles/openbsd/pkg/PLIST
+++ b/buildfiles/openbsd/pkg/PLIST
@@ -1,2 +1,2 @@
 @comment $OpenBSD: PLIST,v$
-@bin bin/apg-go
+@bin bin/apg-go
\ No newline at end of file