diff --git a/textproc/uncrustify/Makefile b/textproc/uncrustify/Makefile
index 900db1d67258..a94182216af8 100644
--- a/textproc/uncrustify/Makefile
+++ b/textproc/uncrustify/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	uncrustify
-PORTVERSION=	0.72.0
+PORTVERSION=	0.73.0
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	textproc
 
diff --git a/textproc/uncrustify/distinfo b/textproc/uncrustify/distinfo
index 6674647a0f08..da68150554a3 100644
--- a/textproc/uncrustify/distinfo
+++ b/textproc/uncrustify/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604773394
-SHA256 (uncrustify-uncrustify-uncrustify-0.72.0_GH0.tar.gz) = d6fff70bc7823fac4c77013055333b79a4839909094e8eee8a14ee8f1777374e
-SIZE (uncrustify-uncrustify-uncrustify-0.72.0_GH0.tar.gz) = 1530850
+TIMESTAMP = 1620992495
+SHA256 (uncrustify-uncrustify-uncrustify-0.73.0_GH0.tar.gz) = 2df0326ba8c413d675b796e051d89a318b7c9cccebc993d66466e2e7fd970672
+SIZE (uncrustify-uncrustify-uncrustify-0.73.0_GH0.tar.gz) = 1616213
diff --git a/textproc/uncrustify/files/patch-src_backup.cpp b/textproc/uncrustify/files/patch-src_backup.cpp
new file mode 100644
index 000000000000..3559973d0d7b
--- /dev/null
+++ b/textproc/uncrustify/files/patch-src_backup.cpp
@@ -0,0 +1,13 @@
+--- src/backup.cpp.orig	2021-05-13 14:53:40 UTC
++++ src/backup.cpp
+@@ -29,9 +29,7 @@
+ #include "md5.h"
+ #include "unc_ctype.h"
+ 
+-#ifdef __APPLE__
+-#include <cerrno>                // is needed under OSX
+-#endif
++#include <cerrno>
+ 
+ using namespace std;
+ 
diff --git a/textproc/uncrustify/files/patch-src_keywords.cpp b/textproc/uncrustify/files/patch-src_keywords.cpp
new file mode 100644
index 000000000000..d0923a5ac44d
--- /dev/null
+++ b/textproc/uncrustify/files/patch-src_keywords.cpp
@@ -0,0 +1,10 @@
+--- src/keywords.cpp.orig	2021-05-13 14:53:40 UTC
++++ src/keywords.cpp
+@@ -13,6 +13,7 @@
+ #include "args.h"
+ #include "prototypes.h"
+ 
++#include <cerrno>
+ #include <map>
+ 
+ 
diff --git a/textproc/uncrustify/files/patch-src_output.cpp b/textproc/uncrustify/files/patch-src_output.cpp
new file mode 100644
index 000000000000..85c70a21a9bf
--- /dev/null
+++ b/textproc/uncrustify/files/patch-src_output.cpp
@@ -0,0 +1,16 @@
+--- src/output.cpp.orig	2021-05-13 14:53:40 UTC
++++ src/output.cpp
+@@ -17,12 +17,9 @@
+ #include "unc_ctype.h"
+ #include "unicode.h"
+ 
++#include <map>
+ #include <regex>
+ #include <set>
+-
+-#ifdef WIN32
+-#include <map>                    // to get std::map
+-#endif // WIN32
+ 
+ 
+ constexpr static auto LCURRENT = LOUTPUT;
diff --git a/textproc/uncrustify/files/patch-src_tokenize.cpp b/textproc/uncrustify/files/patch-src_tokenize.cpp
new file mode 100644
index 000000000000..5355d9270c67
--- /dev/null
+++ b/textproc/uncrustify/files/patch-src_tokenize.cpp
@@ -0,0 +1,14 @@
+--- src/tokenize.cpp.orig	2021-05-13 14:53:40 UTC
++++ src/tokenize.cpp
+@@ -16,10 +16,7 @@
+ #include "unc_ctype.h"
+ 
+ #include <regex>
+-
+-#ifdef WIN32
+-#include <stack>            // to get std::stack
+-#endif // WIN32
++#include <stack>
+ 
+ 
+ #define LE_COUNT(x)    cpd.le_counts[static_cast<size_t>(LE_ ## x)]
diff --git a/textproc/uncrustify/files/patch-src_uncrustify.cpp b/textproc/uncrustify/files/patch-src_uncrustify.cpp
new file mode 100644
index 000000000000..0e042ba8fee5
--- /dev/null
+++ b/textproc/uncrustify/files/patch-src_uncrustify.cpp
@@ -0,0 +1,10 @@
+--- src/uncrustify.cpp.orig	2021-05-13 14:53:40 UTC
++++ src/uncrustify.cpp
+@@ -43,6 +43,7 @@
+ #include "universalindentgui.h"
+ #include "width.h"
+ 
++#include <cerrno>
+ #include <fcntl.h>
+ #include <map>
+ #ifdef HAVE_UNISTD_H