diff --git a/graphics/gmic/Makefile b/graphics/gmic/Makefile
index a788f94cf3cc..21d326cfc23a 100644
--- a/graphics/gmic/Makefile
+++ b/graphics/gmic/Makefile
@@ -1,42 +1,45 @@
 PORTNAME=	gmic
 DISTVERSION=	3.1.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://gmic.eu/files/source/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for image processing
 
 LICENSE=	CeCILL
 LICENSE_NAME=	CeCILL
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/../COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_i386=	error: "c++ crashes, clang-5 and 6 fail: undefined reference to `__atomic_load'"
 
 BUILD_DEPENDS=	gimptool-2.0:graphics/gimp-app
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libfftw3.so:math/fftw3 \
 		libGraphicsMagick++.so:graphics/GraphicsMagick \
 		libOpenEXR.so:graphics/openexr \
 		libImath.so:math/Imath \
 		libopencv_core.so:graphics/opencv \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		compiler:c++11-lang gettext-runtime gmake jpeg localbase:ldflags pkgconfig xorg
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xau xcb xdmcp
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-MAKE_JOBS_UNSAFE=	yes
+WRKSRC_SUBDIR=	src # because of makefile issues, see https://github.com/dtschump/gmic/issues/405
 
-ALL_TARGET=	lib
+MAKE_JOBS_UNSAFE=	yes # see https://github.com/dtschump/gmic/issues/406
+
+ALL_TARGET=	lib cli # cli is bundled here until https://github.com/dtschump/gmic/issues/407 is fixed, afvter which is would be moved to gmic-cli
 
 PORTSCOUT=	limit:[0-9]\..* # not v.220 and similar
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgmic.so.*
 
 .include <bsd.port.mk>
diff --git a/graphics/gmic/files/patch-Makefile b/graphics/gmic/files/patch-Makefile
deleted file mode 100644
index 9f3a3102fd42..000000000000
--- a/graphics/gmic/files/patch-Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- Makefile.orig	2022-05-16 23:01:27 UTC
-+++ Makefile
-@@ -76,4 +76,4 @@
- all: all
- 
- %:
--	cd src && make $*
-+	cd src && $(MAKE) $*
diff --git a/graphics/gmic/files/patch-src_gmic.cpp b/graphics/gmic/files/patch-src_gmic.cpp
index 4444e383d9ba..aecf74a10055 100644
--- a/graphics/gmic/files/patch-src_gmic.cpp
+++ b/graphics/gmic/files/patch-src_gmic.cpp
@@ -1,29 +1,29 @@
---- src/gmic.cpp.orig	2022-06-30 12:35:34 UTC
-+++ src/gmic.cpp
+--- gmic.cpp.orig	2022-06-30 12:35:34 UTC
++++ gmic.cpp
 @@ -2314,7 +2314,7 @@ inline CImgList<void*>& gmic_runs() {
  }
  
  inline void* get_tid() {
 -#if defined(__MACOSX__) || defined(__APPLE__)
 +#if defined(__MACOSX__) || defined(__APPLE__) || defined(__FreeBSD__)
    void* tid = (void*)(cimg_ulong)getpid();
  #elif cimg_OS==1
    void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);
 @@ -2322,7 +2322,7 @@ inline void* get_tid() {
    void* tid = (void*)(cimg_ulong)GetCurrentThreadId();
  #else
    void* tid = (void*)0;
 -#endif // #if defined(__MACOSX__) || defined(__APPLE__)
 +#endif // #if defined(__MACOSX__) || defined(__APPLE__) || defined(__FreeBSD__)
    return tid;
  }
  
 @@ -10762,7 +10762,7 @@ gmic& gmic::_run(const CImgList<char>& commands_line, 
  #ifdef gmic_is_parallel
  #ifdef PTHREAD_CANCEL_ENABLE
  
 -#if defined(__MACOSX__) || defined(__APPLE__)
 +#if defined(__MACOSX__) || defined(__APPLE__) || defined(__FreeBSD__)
                const cimg_uint64 stacksize = (cimg_uint64)8*1024*1024;
                pthread_attr_t thread_attr;
                if (!pthread_attr_init(&thread_attr) && !pthread_attr_setstacksize(&thread_attr,stacksize))
diff --git a/graphics/gmic/pkg-plist b/graphics/gmic/pkg-plist
index b99da8d9407d..ed86a481cb83 100644
--- a/graphics/gmic/pkg-plist
+++ b/graphics/gmic/pkg-plist
@@ -1,9 +1,10 @@
+bin/gmic
 include/gmic.h
 include/gmic_libc.h
 lib/libgmic.so
 lib/libgmic.so.3
 lib/libgmic.so.315
 libexec/gimp/2.2/plug-ins/gmic_cluts.gmz
 libexec/gimp/2.2/plug-ins/gmic_denoise_cnn.gmz
 share/man/fr/man1/gmic.1.gz
 share/man/man1/gmic.1.gz