diff --git a/Tools/uncrustify/build b/Tools/uncrustify/build
new file mode 100755
index 0000000000000000000000000000000000000000..93221b7dec47d6772dc006dd420fb6a4becfacb3
--- /dev/null
+++ b/Tools/uncrustify/build
@@ -0,0 +1,17 @@
+#!/usr/bin/env modbuild
+
+pbuild::add_to_group 'Tools'
+
+pbuild::set_download_url \
+	"https://github.com/$P/$P/archive/$P-${V_PKG}.tar.gz"
+#pbuild::set_sha256sum 'gnuplot-5.2.4.tar.gz:1515f000bd373aaa53b16183f274189d4f5e0ae47d22f434857933d16a4770cb'
+#pbuild::install_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README'
+
+#pbuild::add_configure_args '--with-latex=no'
+#pbuild::add_configure_args '--with-qt=no'
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
diff --git a/Tools/uncrustify/files/variants.rhel6 b/Tools/uncrustify/files/variants.rhel6
new file mode 100644
index 0000000000000000000000000000000000000000..48a4fc563ae3d89dc92f20ed37d59af61e210698
--- /dev/null
+++ b/Tools/uncrustify/files/variants.rhel6
@@ -0,0 +1 @@
+uncrustify/0.71.0	unstable b:cmake/3.15.5 b:Python/3.8.4 b:gcc/8.4.0
diff --git a/Tools/uncrustify/modulefile b/Tools/uncrustify/modulefile
new file mode 100644
index 0000000000000000000000000000000000000000..4c166c307934ae8da4955502d1a2dc1e1c243935
--- /dev/null
+++ b/Tools/uncrustify/modulefile
@@ -0,0 +1,26 @@
+#%Pmodule
+
+module-whatis		"code-formatter"
+module-url		"http://uncrustify.sourceforge.net"
+module-license		"GNU GPLv2"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help		"
+The goals of this project are simple: Create a highly configurable,
+easily modifiable source code beautifier.
+
+Features:
+
+* Indent code, aligning on parens, assignments, etc
+* Align on '=' and variable definitions
+* Align structure initializers
+* Align #define stuff
+* Align backslash-newline stuff
+* Reformat comments (a little bit)
+* Fix inter-character spacing
+* Add or remove parens on return statements
+* Add or remove braces on single-statement if/do/while/for statements
+* Supports embedded SQL 'EXEC SQL' stuff
+* Highly configurable - 735 configurable options as of version 0.71.0
+"
+