diff --git a/bin/xbps-create/main.c b/bin/xbps-create/main.c
index 9074e68a..913f63be 100644
--- a/bin/xbps-create/main.c
+++ b/bin/xbps-create/main.c
@@ -42,6 +42,10 @@
 #include <xbps_api.h>
 #include "queue.h"
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
+
 #define _PROGNAME	"xbps-create"
 
 struct xentry {
diff --git a/bin/xbps-dgraph/main.c b/bin/xbps-dgraph/main.c
index 8cf71336..8795f20e 100644
--- a/bin/xbps-dgraph/main.c
+++ b/bin/xbps-dgraph/main.c
@@ -34,6 +34,10 @@
 
 #include <xbps_api.h>
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
+
 #ifndef __arraycount
 # define __arraycount(a) (sizeof(a) / sizeof(*(a)))
 #endif
diff --git a/bin/xbps-install/question.c b/bin/xbps-install/question.c
index 6d85a6fc..45ab8450 100644
--- a/bin/xbps-install/question.c
+++ b/bin/xbps-install/question.c
@@ -33,6 +33,10 @@
 
 #include "defs.h"
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
+
 static char *
 strtrim(char *str)
 {
diff --git a/lib/cb_util.c b/lib/cb_util.c
index aeec5304..cff1cdac 100644
--- a/lib/cb_util.c
+++ b/lib/cb_util.c
@@ -40,6 +40,10 @@
 
 #include "xbps_api_impl.h"
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
+
 void HIDDEN
 xbps_set_cb_fetch(struct xbps_handle *xhp,
 		  off_t file_size,
diff --git a/lib/initend.c b/lib/initend.c
index 7e3e9037..8ca2acdd 100644
--- a/lib/initend.c
+++ b/lib/initend.c
@@ -34,6 +34,10 @@
 
 #include "xbps_api_impl.h"
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
+
 /**
  * @file lib/initend.c
  * @brief Initialization and finalization routines
diff --git a/lib/util.c b/lib/util.c
index 0e0127c0..6c125bbc 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -41,6 +41,10 @@
 #endif
 #include "xbps_api_impl.h"
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
+
 /**
  * @file lib/util.c
  * @brief Utility routines