diff --git a/print/miktex/Makefile b/print/miktex/Makefile
index 23e8a7411eb0..b0a3fa203d8a 100644
--- a/print/miktex/Makefile
+++ b/print/miktex/Makefile
@@ -1,84 +1,84 @@
 PORTNAME=	miktex
 DISTVERSION=	21.8
 PORTREVISION=	9
 CATEGORIES=	print
 MASTER_SITES=	LOCAL/arrowd/miktex:bootstrap
 DISTFILES=	miktex-zzdb1-2.9.tar.lzma:bootstrap \
 		miktex-zzdb3-2.9.tar.lzma:bootstrap \
 		miktex-config-2.9.tar.lzma:bootstrap \
 		miktex-dvips.tar.lzma:bootstrap \
 		miktex-fontconfig.tar.lzma:bootstrap \
 		miktex-misc.tar.lzma:bootstrap \
 		tetex.tar.lzma:bootstrap
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implementation of TeX/LaTeX
 WWW=		https://miktex.org
 
 LICENSE=	MULTIPLE
 LICENSE_NAME=	Multiple
 LICENSE_TEXT=	This is a collection of many independent packages and does not have a single license
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libboost_locale.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfribidi.so:converters/fribidi \
 		libgd.so:graphics/gd \
 		libgmp.so:math/gmp \
 		libgraphite2.so:graphics/graphite2 \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libhunspell-1.7.so:textproc/hunspell \
 		libicui18n.so:devel/icu \
 		libicuuc.so:devel/icu \
 		liblog4cxx.so:devel/log4cxx \
 		libmpfr.so:math/mpfr \
 		libmspack.so:archivers/libmspack \
 		libinotify.so:devel/libinotify \
 		libpng.so:graphics/png \
 		libpopt.so:devel/popt \
 		liburiparser.so:net/uriparser \
 		libzzip.so:devel/zziplib
 
-USES=		bison cmake:noninja gettext-tools gmake gnome jpeg pkgconfig ssl xorg
+USES=		bison cmake:noninja dos2unix gettext-tools gmake gnome jpeg pkgconfig ssl xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MiKTeX
 
 USE_XORG=	pixman
 USE_GNOME=	cairo libxslt
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		MANPAGES UIQT
 OPTIONS_DEFAULT=	MANPAGES UIQT
 OPTIONS_SUB=		yes
 
 UIQT_DESC=	Build Qt components
 
 MANPAGES_CMAKE_BOOL=	WITH_MAN_PAGES
 UIQT_CMAKE_BOOL=	WITH_UI_QT
 
 UIQT_USES=	qt:5 gl
 UIQT_USE=	qt=core,concurrent,declarative,dbus,gui,linguisttools,network,printsupport,script,scripttools,uitools,widgets,xml,buildtools:build,qmake:build gl=gl
 
 CMAKE_ARGS=	-DMIKTEX_SYSTEM_ETC_FONTS_CONFD_DIR=${LOCALBASE}/etc/fonts/conf.d \
 		-DMIKTEX_SYSTEM_VAR_CACHE_DIR=${DATADIR}/cache \
 		-DMIKTEX_SYSTEM_VAR_LIB_DIR=${DATADIR}/lib
 
 DIST_SUBDIR=	miktex
 
 post-extract:
 	${MKDIR} ${BUILD_WRKSRC}
 .	for f in ${DISTFILES:M*bootstrap}
 		${CP} ${DISTDIR}/${DIST_SUBDIR}/${f:S/:bootstrap//} ${BUILD_WRKSRC}
 .	endfor
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/share/miktex-texmf/miktex/config/*.log
 
 .include <bsd.port.mk>
diff --git a/print/miktex/files/patch-log4cxx b/print/miktex/files/patch-log4cxx
new file mode 100644
index 000000000000..ca82600dbbd0
--- /dev/null
+++ b/print/miktex/files/patch-log4cxx
@@ -0,0 +1,88 @@
+--- Libraries/MiKTeX/App/app.cpp.orig	2021-08-06 15:45:04 UTC
++++ Libraries/MiKTeX/App/app.cpp
+@@ -35,7 +35,7 @@
+ 
+ #include <log4cxx/basicconfigurator.h>
+ #include <log4cxx/logger.h>
+-#include <log4cxx/rollingfileappender.h>
++#include <log4cxx/rolling/rollingfileappender.h>
+ #include <log4cxx/xml/domconfigurator.h>
+ #if defined(LOG4CXX_INFO_FMT)
+ #  define MIKTEX_LOG4CXX_12 1
+--- Programs/Editors/TeXworks/miktex/miktex-texworks.cpp.orig	2021-08-06 15:45:04 UTC
++++ Programs/Editors/TeXworks/miktex/miktex-texworks.cpp
+@@ -35,7 +35,7 @@
+ 
+ #include <log4cxx/logger.h>
+ #include <log4cxx/xml/domconfigurator.h>
+-#include <log4cxx/rollingfileappender.h>
++#include <log4cxx/rolling/rollingfileappender.h>
+ #if defined(LOG4CXX_INFO_FMT)
+ #  define MIKTEX_LOG4CXX_12 1
+ #endif
+--- Programs/MiKTeX/Console/Qt/main.cpp.orig	2021-08-06 15:45:04 UTC
++++ Programs/MiKTeX/Console/Qt/main.cpp
+@@ -33,7 +33,7 @@
+ #include <QTranslator>
+ 
+ #include <log4cxx/logger.h>
+-#include <log4cxx/rollingfileappender.h>
++#include <log4cxx/rolling/rollingfileappender.h>
+ #include <log4cxx/xml/domconfigurator.h>
+ 
+ #include "console-version.h"
+--- Programs/MiKTeX/PackageManager/mpm/mpm.cpp.orig	2021-08-06 15:45:04 UTC
++++ Programs/MiKTeX/PackageManager/mpm/mpm.cpp
+@@ -44,7 +44,7 @@
+ #include <fmt/ostream.h>
+ 
+ #include <log4cxx/logger.h>
+-#include <log4cxx/rollingfileappender.h>
++#include <log4cxx/rolling/rollingfileappender.h>
+ #include <log4cxx/xml/domconfigurator.h>
+ #if defined(LOG4CXX_INFO_FMT)
+ #  define MIKTEX_LOG4CXX_12 1
+--- Programs/MiKTeX/Yap/MFC/StdAfx.h.orig	2021-08-06 15:45:04 UTC
++++ Programs/MiKTeX/Yap/MFC/StdAfx.h
+@@ -62,7 +62,7 @@
+ #include <string>
+ 
+ #include <log4cxx/logger.h>
+-#include <log4cxx/rollingfileappender.h>
++#include <log4cxx/rolling/rollingfileappender.h>
+ #include <log4cxx/xml/domconfigurator.h>
+ 
+ #include <fmt/format.h>
+--- Programs/MiKTeX/initexmf/initexmf.cpp.orig	2021-08-06 15:45:04 UTC
++++ Programs/MiKTeX/initexmf/initexmf.cpp
+@@ -67,7 +67,7 @@
+ 
+ #include <log4cxx/basicconfigurator.h>
+ #include <log4cxx/logger.h>
+-#include <log4cxx/rollingfileappender.h>
++#include <log4cxx/rolling/rollingfileappender.h>
+ #include <log4cxx/xml/domconfigurator.h>
+ #if defined(LOG4CXX_INFO_FMT)
+ #  define MIKTEX_LOG4CXX_12 1
+--- Programs/MiKTeX/miktex/miktex.cpp.orig	2021-08-06 15:45:04 UTC
++++ Programs/MiKTeX/miktex/miktex.cpp
+@@ -34,7 +34,7 @@
+ 
+ #include <log4cxx/basicconfigurator.h>
+ #include <log4cxx/logger.h>
+-#include <log4cxx/rollingfileappender.h>
++#include <log4cxx/rolling/rollingfileappender.h>
+ #include <log4cxx/xml/domconfigurator.h>
+ #if defined(LOG4CXX_INFO_FMT)
+ #  define MIKTEX_LOG4CXX_12 1
+--- Programs/MiKTeX/mkfntmap/internal.h.orig	2021-08-06 15:45:04 UTC
++++ Programs/MiKTeX/mkfntmap/internal.h
+@@ -57,7 +57,7 @@
+ 
+ #include <log4cxx/logger.h>
+ #include <log4cxx/xml/domconfigurator.h>
+-#include <log4cxx/rollingfileappender.h>
++#include <log4cxx/rolling/rollingfileappender.h>
+ 
+ #define UNUSED_ALWAYS(x)
+