diff --git a/Makefile b/Makefile
index 59d1c67..d502e43 100644
--- a/Makefile
+++ b/Makefile
@@ -6,15 +6,21 @@ RM=rm
 UNAME_SYS := $(shell uname -s)
 ifeq ($(UNAME_SYS), Linux)
 	LDFLAGS += -luuid -lresolv -Wl,-Bsymbolic-functions -Wl,-z,relro
-	CFLAGS ?= -D_FORTIFY_SOURCE=2 -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -fno-strict-aliasing
+	CFLAGS ?= -D_FORTIFY_SOURCE=2 -O2 -fstack-protector \
+			  --param=ssp-buffer-size=4 -Wformat -Werror=format-security \
+			  -fno-strict-aliasing
 	XMPPIPE_SANDBOX ?= XMPPIPE_SANDBOX_SECCOMP
 	XMPPIPE_SANDBOX_RLIMIT_NOFILE ?= 0
 else ifeq ($(UNAME_SYS), FreeBSD)
-	CFLAGS ?= -D_FORTIFY_SOURCE=2 -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -fno-strict-aliasing
+	CFLAGS ?= -D_FORTIFY_SOURCE=2 -O2 -fstack-protector \
+			  --param=ssp-buffer-size=4 -Wformat -Werror=format-security \
+			  -fno-strict-aliasing
 	XMPPIPE_SANDBOX ?= XMPPIPE_SANDBOX_CAPSICUM
 else ifeq ($(UNAME_SYS), OpenBSD)
 	XMPPIPE_SANDBOX ?= XMPPIPE_SANDBOX_PLEDGE
-	CFLAGS ?= -D_FORTIFY_SOURCE=2 -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -fno-strict-aliasing
+	CFLAGS ?= -D_FORTIFY_SOURCE=2 -O2 -fstack-protector \
+			  --param=ssp-buffer-size=4 -Wformat -Werror=format-security \
+			  -fno-strict-aliasing
 else ifeq ($(UNAME_SYS), SunOS)
 	LDFLAGS += -luuid -lresolv
 else ifeq ($(UNAME_SYS), Darwin)
@@ -32,9 +38,9 @@ $(PROG):
 	$(CC) -g -Wall $(CFLAGS) -o xmppipe src/*.c $(LDFLAGS) -lstrophe
 
 static:
-	$(CC) $(CFLAGS) -g -Wall -o xmppipe src/*.c -Wl,--no-as-needed -ldl -lz \
+	$(CC) $(CFLAGS) -g -Wall -o xmppipe src/*.c -Wl,--no-as-needed \
+		-ldl -lz -lresolv \
 		/usr/local/lib/libstrophe.a \
-		/usr/lib/*/libresolv.a \
 		/usr/lib/*/libssl.a \
 		/usr/lib/*/libcrypto.a \
 		/usr/lib/*/libexpat.a \