diff --git a/contrib/uncrustify.cfg b/contrib/uncrustify.cfg
index 8c9df2c4..72520189 100644
--- a/contrib/uncrustify.cfg
+++ b/contrib/uncrustify.cfg
@@ -93,3 +93,19 @@ nl_func_type_name = force
 nl_else_brace = add
 nl_elseif_brace = add
 nl_for_brace = add
+
+# Whether to ignore the '#define' body while formatting.
+pp_ignore_define_body           = true    # true/false
+
+# Add or remove space between #else or #endif and a trailing comment.
+sp_endif_cmt                    = add   # ignore/add/remove/force
+
+# The span for aligning comments that end lines.
+#
+# 0: Don't align (default).
+align_right_cmt_span            = 3        # unsigned number
+
+# Minimum number of columns between preceding text and a trailing comment in
+# order for the comment to qualify for being aligned. Must be non-zero to have
+# an effect.
+align_right_cmt_gap             = 2        # unsigned number