diff --git a/graphics/art/Makefile b/graphics/art/Makefile
index 16daccea850b..a085163b2d05 100644
--- a/graphics/art/Makefile
+++ b/graphics/art/Makefile
@@ -1,52 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	art
-PORTVERSION=	1.5.4.20201118
+DISTVERSION=	1.6.1
 CATEGORIES=	graphics
-MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
+MASTER_SITES=	https://bitbucket.org/agriggio/art/downloads/
 PKGNAMESUFFIX=	-raw-image-editor
+DISTNAME=	${PORTNAME:tu}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Raw image processing program
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
+BROKEN_i386=	ld: error: undefined symbol: __atomic_load
+
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
 LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libfftw3f.so:math/fftw3-float \
 		liblensfun.so:graphics/lensfun \
 		liblcms2.so:graphics/lcms2 \
 		libpng16.so:graphics/png \
 		libtiff.so:graphics/tiff
 
-USES=		cmake compiler:c++11-lang desktop-file-utils gnome jpeg pkgconfig xorg
+USES=		cmake compiler:c++11-lang desktop-file-utils gnome jpeg pkgconfig tar:xz xorg
 USE_GNOME=	atk atkmm cairo cairomm glibmm gtkmm30 librsvg2
 USE_XORG=	x11
 
-WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
-
 INSTALLS_ICONS=	yes
 
-BB_ACCOUNT=	agriggio
-BB_PROJECT=	art
-BB_COMMIT=	b2d77c8f0080
-
 .include <bsd.port.pre.mk>
 
 # breaks with llvm-8
 .if ${CHOSEN_COMPILER_TYPE} == clang
-LLVM_VERSION=   10
+LLVM_VERSION=	10
 BUILD_DEPENDS+=	clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 CC=		clang${LLVM_VERSION}
 CXX=		clang++${LLVM_VERSION}
 CPP=		clang-cpp${LLVM_VERSION}
 .endif
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/share/doc/ART
 
 .include <bsd.port.post.mk>
diff --git a/graphics/art/distinfo b/graphics/art/distinfo
index c85d28befc4d..4ce4e5d9ca14 100644
--- a/graphics/art/distinfo
+++ b/graphics/art/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1605729743
-SHA256 (art-1.5.4.20201118.tar.gz) = 2c831565c82f812df128cb8ef29bf555b2598ee5fc573585803727923f7bf147
-SIZE (art-1.5.4.20201118.tar.gz) = 59947909
+TIMESTAMP = 1607554552
+SHA256 (ART-1.6.1.tar.xz) = 7f88a10fe60a0c430b57bf33b3043647d3c48ebd01441776a68eeafd007f07c0
+SIZE (ART-1.6.1.tar.xz) = 15702288