diff --git a/demo/gtk-libfprint-test.c b/demo/gtk-libfprint-test.c
index 30e91ef2..d914c121 100644
--- a/demo/gtk-libfprint-test.c
+++ b/demo/gtk-libfprint-test.c
@@ -101,11 +101,14 @@ plot_minutiae (unsigned char *rgbdata,
 {
   int i;
 
-#define write_pixel(num) do { \
-            rgbdata[((num) * 3)] = 0xff; \
-            rgbdata[((num) * 3) + 1] = 0; \
-            rgbdata[((num) * 3) + 2] = 0; \
-  } while(0)
+  #define write_pixel(num) \
+    do \
+      { \
+        rgbdata[((num) * 3)] = 0xff; \
+        rgbdata[((num) * 3) + 1] = 0; \
+        rgbdata[((num) * 3) + 2] = 0; \
+      } \
+    while(0)
 
   for (i = 0; i < minutiae->len; i++)
     {
diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c
index 5149dbd0..828306bb 100644
--- a/libfprint/drivers/upekts.c
+++ b/libfprint/drivers/upekts.c
@@ -196,8 +196,9 @@ struct read_msg_data
 static void __read_msg_async (FpDevice             *dev,
                               struct read_msg_data *udata);
 
-#define READ_MSG_DATA_CB_ERR(dev, udata, error) (udata)->callback (dev, \
-                                                                   READ_MSG_CMD, 0, 0, NULL, 0, (udata)->user_data, error)
+#define READ_MSG_DATA_CB_ERR(dev, udata, error) \
+  (udata)->callback (dev, \
+                     READ_MSG_CMD, 0, 0, NULL, 0, (udata)->user_data, error)
 
 static void
 busy_ack_sent_cb (FpiUsbTransfer *transfer, FpDevice *device,
diff --git a/libfprint/drivers/vfs101.c b/libfprint/drivers/vfs101.c
index 6963c59e..7020726a 100644
--- a/libfprint/drivers/vfs101.c
+++ b/libfprint/drivers/vfs101.c
@@ -162,9 +162,9 @@ enum {
 
 /* Dump buffer for debug */
 #define dump_buffer(buf) \
-        fp_dbg ("%02x %02x %02x %02x %02x %02x %02x %02x", \
-                buf[6], buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13] \
-               )
+  fp_dbg ("%02x %02x %02x %02x %02x %02x %02x %02x", \
+          buf[6], buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13] \
+         )
 
 /* Callback of asynchronous send */
 static void
diff --git a/libfprint/drivers/vfs301_proto.c b/libfprint/drivers/vfs301_proto.c
index 6bbb3c7d..122a889a 100644
--- a/libfprint/drivers/vfs301_proto.c
+++ b/libfprint/drivers/vfs301_proto.c
@@ -157,7 +157,7 @@ vfs301_proto_generate_0B (int subtype, gssize *len)
 }
 
 #define HEX_TO_INT(c) \
-        (((c) >= '0' && (c) <= '9') ? ((c) - '0') : ((c) - 'A' + 10))
+  (((c) >= '0' && (c) <= '9') ? ((c) - '0') : ((c) - 'A' + 10))
 
 static guint8 *
 translate_str (const char **srcL, gssize *len)
@@ -422,15 +422,15 @@ img_process_data (int first_block, FpDeviceVfs301 *dev, const guint8 *buf, int l
 /************************** PROTOCOL STUFF ************************************/
 
 #define USB_RECV(from, len) \
-        usb_recv (dev, from, len, NULL, NULL)
+  usb_recv (dev, from, len, NULL, NULL)
 
 #define USB_SEND(type, subtype) \
-        { \
-          const guint8 *data; \
-          gssize len; \
-          data = vfs301_proto_generate (type, subtype, &len); \
-          usb_send (dev, data, len, NULL); \
-        }
+  { \
+    const guint8 *data; \
+    gssize len; \
+    data = vfs301_proto_generate (type, subtype, &len); \
+    usb_send (dev, data, len, NULL); \
+  }
 
 #define RAW_DATA(x) g_memdup2 (x, sizeof (x)), sizeof (x)
 
@@ -489,13 +489,13 @@ vfs301_proto_peek_event (FpDeviceVfs301 *dev)
  *      we will run into timeouts randomly and need to then try again.
  */
 #define PARALLEL_RECEIVE(e1, l1, e2, l2) \
-        { \
-          g_autoptr(GError) error = NULL; \
-          usb_recv (dev, e1, l1, NULL, &error); \
-          usb_recv (dev, e2, l2, NULL, NULL); \
-          if (g_error_matches (error, G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_TIMED_OUT)) \
-          usb_recv (dev, e1, l1, NULL, NULL); \
-        }
+  { \
+    g_autoptr(GError) error = NULL; \
+    usb_recv (dev, e1, l1, NULL, &error); \
+    usb_recv (dev, e2, l2, NULL, NULL); \
+    if (g_error_matches (error, G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_TIMED_OUT)) \
+    usb_recv (dev, e1, l1, NULL, NULL); \
+  }
 
 static void
 vfs301_proto_process_event_cb (FpiUsbTransfer *transfer,
diff --git a/libfprint/drivers/vfs5011.c b/libfprint/drivers/vfs5011.c
index 65c98c96..b9e0587b 100644
--- a/libfprint/drivers/vfs5011.c
+++ b/libfprint/drivers/vfs5011.c
@@ -41,30 +41,30 @@ struct usb_action
 };
 
 #define SEND(ENDPOINT, COMMAND) \
-        { \
-          .type = ACTION_SEND, \
-          .endpoint = ENDPOINT, \
-          .name = #COMMAND, \
-          .size = sizeof (COMMAND), \
-          .data = COMMAND \
-        },
+  { \
+    .type = ACTION_SEND, \
+    .endpoint = ENDPOINT, \
+    .name = #COMMAND, \
+    .size = sizeof (COMMAND), \
+    .data = COMMAND \
+  },
 
 #define RECV(ENDPOINT, SIZE) \
-        { \
-          .type = ACTION_RECEIVE, \
-          .endpoint = ENDPOINT, \
-          .size = SIZE, \
-          .data = NULL \
-        },
+  { \
+    .type = ACTION_RECEIVE, \
+    .endpoint = ENDPOINT, \
+    .size = SIZE, \
+    .data = NULL \
+  },
 
 #define RECV_CHECK(ENDPOINT, SIZE, EXPECTED) \
-        { \
-          .type = ACTION_RECEIVE, \
-          .endpoint = ENDPOINT, \
-          .size = SIZE, \
-          .data = EXPECTED, \
-          .correct_reply_size = sizeof (EXPECTED) \
-        },
+  { \
+    .type = ACTION_RECEIVE, \
+    .endpoint = ENDPOINT, \
+    .size = SIZE, \
+    .data = EXPECTED, \
+    .correct_reply_size = sizeof (EXPECTED) \
+  },
 
 struct usbexchange_data
 {
diff --git a/libfprint/drivers/vfs7552.c b/libfprint/drivers/vfs7552.c
index 852e35b5..53b4d3f3 100644
--- a/libfprint/drivers/vfs7552.c
+++ b/libfprint/drivers/vfs7552.c
@@ -51,39 +51,39 @@ struct usb_action
 };
 
 #define SEND(ENDPOINT, COMMAND) \
-        {                             \
-          .type = ACTION_SEND,        \
-          .endpoint = ENDPOINT,       \
-          .name = #COMMAND,           \
-          .size = sizeof (COMMAND),   \
-          .data = COMMAND             \
-        },
+  {                             \
+    .type = ACTION_SEND,        \
+    .endpoint = ENDPOINT,       \
+    .name = #COMMAND,           \
+    .size = sizeof (COMMAND),   \
+    .data = COMMAND             \
+  },
 
 #define RECV(ENDPOINT, SIZE)  \
-        {                           \
-          .type = ACTION_RECEIVE,   \
-          .endpoint = ENDPOINT,     \
-          .size = SIZE,             \
-          .data = NULL              \
-        },
+  {                           \
+    .type = ACTION_RECEIVE,   \
+    .endpoint = ENDPOINT,     \
+    .size = SIZE,             \
+    .data = NULL              \
+  },
 
 #define RECV_CHECK(ENDPOINT, SIZE, EXPECTED) \
-        {                                          \
-          .type = ACTION_RECEIVE,                  \
-          .endpoint = ENDPOINT,                    \
-          .size = SIZE,                            \
-          .data = EXPECTED,                        \
-          .correct_reply_size = sizeof (EXPECTED)  \
-        },
+  {                                          \
+    .type = ACTION_RECEIVE,                  \
+    .endpoint = ENDPOINT,                    \
+    .size = SIZE,                            \
+    .data = EXPECTED,                        \
+    .correct_reply_size = sizeof (EXPECTED)  \
+  },
 
 #define RECV_CHECK_SIZE(ENDPOINT, SIZE, EXPECTED) \
-        {                                               \
-          .type = ACTION_RECEIVE,                       \
-          .endpoint = ENDPOINT,                         \
-          .size = SIZE,                                 \
-          .data = NULL,                                 \
-          .correct_reply_size = sizeof (EXPECTED)       \
-        },
+  {                                               \
+    .type = ACTION_RECEIVE,                       \
+    .endpoint = ENDPOINT,                         \
+    .size = SIZE,                                 \
+    .data = NULL,                                 \
+    .correct_reply_size = sizeof (EXPECTED)       \
+  },
 
 struct usbexchange_data
 {
diff --git a/libfprint/fp-print.h b/libfprint/fp-print.h
index 7a2abee3..ac6820d7 100644
--- a/libfprint/fp-print.h
+++ b/libfprint/fp-print.h
@@ -29,7 +29,7 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (FpPrint, fp_print, FP, PRINT, GInitiallyUnowned)
 
 #define FP_FINGER_IS_VALID(finger) \
-        ((finger) >= FP_FINGER_FIRST && (finger) <= FP_FINGER_LAST)
+  ((finger) >= FP_FINGER_FIRST && (finger) <= FP_FINGER_LAST)
 
 #include "fp-device.h"
 
diff --git a/libfprint/fpi-log.h b/libfprint/fpi-log.h
index 3231cf5f..cd8f1bd5 100644
--- a/libfprint/fpi-log.h
+++ b/libfprint/fpi-log.h
@@ -79,13 +79,16 @@
  *
  * Uses fp_err() to print an error if the @condition is true.
  */
-#define BUG_ON(condition) G_STMT_START          \
-        if (condition) {                        \
-            char *s;                        \
-            s = g_strconcat ("BUG: (", #condition, ")", NULL); \
-            fp_err ("%s: %s() %s:%d", s, G_STRFUNC, __FILE__, __LINE__); \
-            g_free (s);                     \
-          } G_STMT_END
+#define BUG_ON(condition) \
+  G_STMT_START          \
+  if (condition) \
+    {                        \
+      char *s;                        \
+      s = g_strconcat ("BUG: (", #condition, ")", NULL); \
+      fp_err ("%s: %s() %s:%d", s, G_STRFUNC, __FILE__, __LINE__); \
+      g_free (s);                     \
+    } \
+  G_STMT_END
 
 /**
  * BUG:
diff --git a/libfprint/fpi-ssm.h b/libfprint/fpi-ssm.h
index ab80a26f..d2601c88 100644
--- a/libfprint/fpi-ssm.h
+++ b/libfprint/fpi-ssm.h
@@ -60,7 +60,7 @@ typedef void (*FpiSsmHandlerCallback)(FpiSsm   *ssm,
 
 /* for library and drivers */
 #define fpi_ssm_new(dev, handler, nr_states) \
-        fpi_ssm_new_full (dev, handler, nr_states, nr_states, #nr_states)
+  fpi_ssm_new_full (dev, handler, nr_states, nr_states, #nr_states)
 FpiSsm *fpi_ssm_new_full (FpDevice             *dev,
                           FpiSsmHandlerCallback handler,
                           int                   nr_states,
diff --git a/scripts/uncrustify.cfg b/scripts/uncrustify.cfg
index 34b9a358..705a0970 100644
--- a/scripts/uncrustify.cfg
+++ b/scripts/uncrustify.cfg
@@ -19,6 +19,7 @@ indent_func_proto_param false
 indent_switch_case      0
 indent_case_brace       2
 indent_paren_close      1
+pp_multiline_define_body_indent 2
 
 # spacing
 sp_arith                        Add
@@ -114,6 +115,7 @@ nl_create_for_one_liner         False
 nl_create_while_one_liner       False
 nl_after_semicolon              True
 nl_multi_line_cond              true
+nl_multi_line_define            true
 
 # mod
 # I'd like these to be remove, but that removes brackets in if { if { foo } }, which i dislike