diff --git a/science/bagel/Makefile b/science/bagel/Makefile
index cab7c2e94cc1..88538c9358d9 100644
--- a/science/bagel/Makefile
+++ b/science/bagel/Makefile
@@ -1,52 +1,58 @@
 PORTNAME=	bagel
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.2
-PORTREVISION=	6
+DISTVERSION=	1.2.2-132
+DISTVERSIONSUFFIX=	-g2955e4d1a
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Brilliantly Advanced General Electronic-structure Library
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_i386=	error: static_assert failed "size_t is assumed to be the same size as unsigned long long"
-BROKEN=		error: no type named 'library_version_type' in namespace 'boost::archive'
 
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs
+TEST_DEPENDS=	cblas>0:math/cblas
 
 USES=		autoreconf blaslapack:openblas compiler:c++11-lang fortran gmake libtool localbase python:build
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datarootdir=${DATADIR}
-USE_GITHUB=	yes
-GH_ACCOUNT=	nubakery
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	qsimulate-open
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--datarootdir=${DATADIR}
+
+INSTALL_TARGET=	install-strip
+
 OPTIONS_DEFINE=			MPI LIBXC SCALAPACK SMITH # SLATER (needs a separate lib)
 OPTIONS_DEFAULT=		MPI LIBXC SCALAPACK SMITH
 
 MPI_CONFIGURE_ON=		--with-mpi=openmpi
 MPI_CONFIGURE_OFF=		--with-mpi=no
 MPI_LIB_DEPENDS=		libmpicxx.so:net/mpich # openmpi option erroneously links to mpich (due to a name clash)
 
 LIBXC_DESC=			Build DFT with libxc
 LIBXC_CONFIGURE_WITH=		libxc
 LIBXC_LIB_DEPENDS=		libxc.so:science/libxc
 
 SCALAPACK_DESC=			Use ScaLapack library for parallelized linear algebra
 SCALAPACK_CONFIGURE_ENABLE=	scalapack
 SCALAPACK_VARS=			LDFLAGS+="-lscalapack"
 SCALAPACK_VARS_OFF=		LDFLAGS+="${BLASLIB} ${LAPACKLIB}" # -llapack -lblas are a replacement of libscalapack
 SCALAPACK_LIB_DEPENDS=		libscalapack.so:math/scalapack
 SCALAPACK_IMPLIES=		MPI
 
 SMITH_DESC=			Compile SMITH generated code
 SMITH_CONFIGURE_ENABLE=		smith
 SMITH_IMPLIES=			MPI
 
-TEST_TARGET=			check # tests fail to build: https://github.com/nubakery/bagel/issues/145
-#TEST_ENV=			${MAKE_ARGS}
-#TEST_ARGS=			${MAKE_ARGS}
+TEST_TARGET=			check
+TEST_ARGS=			LDFLAGS+="-lcblas -lblas" ${TEST_TARGET}
+
+post-test: # tests fail, see https://github.com/qsimulate-open/bagel/issues/248
+	@cd ${WRKSRC}/src && ./TestSuite --log_level=all
 
 .include <bsd.port.mk>
diff --git a/science/bagel/distinfo b/science/bagel/distinfo
index 37114f1ec1ca..7566be8b899d 100644
--- a/science/bagel/distinfo
+++ b/science/bagel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547548872
-SHA256 (nubakery-bagel-v1.2.2_GH0.tar.gz) = b9ef9ad5ad9b836b5393badb5a3e5b162d6ff32da497f69d05ef9e4d091b558a
-SIZE (nubakery-bagel-v1.2.2_GH0.tar.gz) = 41551016
+TIMESTAMP = 1655961216
+SHA256 (qsimulate-open-bagel-v1.2.2-132-g2955e4d1a_GH0.tar.gz) = 15789ea304d28cd62203973772e198b80846bb1fa8d6c148289d6471abb26fcf
+SIZE (qsimulate-open-bagel-v1.2.2-132-g2955e4d1a_GH0.tar.gz) = 35668444