diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index 971098de2df..ccbd8809c67 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -1,21 +1,13 @@
 COMMENT=	manage and configure devices that support IPMI
 
-# use a git archive for now, the last release is rather old
-# https://github.com/ipmitool/ipmitool/issues/303
-# if changing back to a release when available, check if post-configure
-# and MASTER_SITES0 can go too.
+V=		1.8.19
 GH_ACCOUNT=	ipmitool
 GH_PROJECT=	ipmitool
-GH_COMMIT=	a1dc78c4566734075c433ca61e71bd18c7058c6d
-DISTNAME=	ipmitool-1.8.18pl20220805
+GH_TAGNAME=	IPMITOOL_${V:S/./_/g}
+PKGNAME=	ipmitool-$V
 DISTFILES=	${GH_DISTFILE} enterprise-numbers.20220204.gz:0
-# XXX can't use GH_DISTFILE since EXTRACT_ONLY expects filenames instead of
-# DISTFILES filename{url}sufx patterns
-EXTRACT_ONLY=	${DISTNAME}-${GH_COMMIT:C/(........).*/\1/}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${GH_DISTFILE}
 
-#V=		1.8.18
-#DISTNAME=	ipmitool-$V
-#EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	sysutils
 
 HOMEPAGE=	https://github.com/ipmitool/ipmitool
@@ -30,7 +22,6 @@ WANTLIB=	m curses edit crypto c
 # -std=gnu11
 COMPILER =	base-clang ports-gcc
 
-#MASTER_SITES=	https://github.com/ipmitool/ipmitool/releases/download/IPMITOOL_${V:C/\./_/g}/
 MASTER_SITES0=	https://spacehopper.org/mirrors/
 
 SEPARATE_BUILD=	Yes
@@ -59,8 +50,6 @@ CONFIGURE_ARGS+=	--disable-intf-open
 pre-configure:
 	cd ${WRKSRC}/contrib; sed -i 's,^#!/bin/bash,#!/bin/sh,' bmclanconf *.sh
 
-# hopefully there is a bundled file when there's a new release and
-# we can get rid of this mess
 CONFIGURE_ENV+=	ac_cv_prog_CURL=curl
 post-configure:
 	gzcat < ${FULLDISTDIR}/enterprise-numbers.20220204.gz > ${WRKBUILD}/enterprise-numbers
diff --git a/sysutils/ipmitool/distinfo b/sysutils/ipmitool/distinfo
index 1182154ee8a..2c460d44985 100644
--- a/sysutils/ipmitool/distinfo
+++ b/sysutils/ipmitool/distinfo
@@ -1,4 +1,4 @@
 SHA256 (enterprise-numbers.20220204.gz) = a3ptuTlYClgV3h2zm44pfGJz30jK9YsNt4r5WRGXdhs=
-SHA256 (ipmitool-1.8.18pl20220805-a1dc78c4.tar.gz) = g7EW2g9w/2NPm7GWsimMqrkEIf4EHI/lb8ttwo3BeQw=
+SHA256 (ipmitool-IPMITOOL_1_8_19.tar.gz) = xHQbFq9NWg1nRWQHrcD0/sZiYVibTCzpYmlO3IieJIA=
 SIZE (enterprise-numbers.20220204.gz) = 1892476
-SIZE (ipmitool-1.8.18pl20220805-a1dc78c4.tar.gz) = 638428
+SIZE (ipmitool-IPMITOOL_1_8_19.tar.gz) = 638074
diff --git a/sysutils/ipmitool/patches/patch-configure_ac b/sysutils/ipmitool/patches/patch-configure_ac
index 154041f7cb3..35e532b8465 100644
--- a/sysutils/ipmitool/patches/patch-configure_ac
+++ b/sysutils/ipmitool/patches/patch-configure_ac
@@ -9,6 +9,15 @@ Fix bad AC_TRY_COMPILE check.
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
+@@ -2,7 +2,7 @@ dnl
+ dnl autoconf for ipmitool
+ dnl
+ m4_define([git_suffix], m4_esyscmd_s(./csv-revision))
+-AC_INIT([ipmitool], [1.8.18git_suffix])
++AC_INIT([ipmitool], [1.8.19git_suffix])
+ AC_CONFIG_SRCDIR([src/ipmitool.c])
+ AC_CONFIG_COMMANDS_PRE([export prefix=$prefix])
+ AC_CANONICAL_SYSTEM
 @@ -36,7 +36,7 @@ AC_CHECK_FUNCS([alarm gethostbyname getaddrinfo getifa
  AC_CHECK_FUNCS([memmove memset strchr strdup strerror])
  AC_CHECK_FUNCS([getpassphrase])