diff --git a/Makefile b/Makefile
index 0f97693..0aa9db2 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,6 @@ mandir = $(datadir)/man
 OBJ = proxytunnel.o	\
 	base64.o	\
 	strzcat.o	\
-	setproctitle.o	\
 	io.o		\
 	http.o		\
 	basicauth.o	\
@@ -77,6 +76,10 @@ OBJ = proxytunnel.o	\
 	ntlm.o		\
 	ptstream.o
 
+ifneq (,$(findstring -DSETPROCTITLE,$(OPTFLAGS)))
+OBJ += setproctitle.o
+endif
+
 UNAME = $(shell uname)
 ifneq ($(UNAME),Darwin)
 OBJ += strlcpy.o	\
diff --git a/proxytunnel.h b/proxytunnel.h
index 74547f8..88a5471 100644
--- a/proxytunnel.h
+++ b/proxytunnel.h
@@ -30,8 +30,10 @@ void analyze_HTTP(PTSTREAM *pts);
 void proxy_protocol(PTSTREAM *pts);
 void closeall();
 void do_daemon();
+#ifdef SETPROCTITLE
 void initsetproctitle(int argc, char *argv[]);
 void setproctitle(const char *fmt, ...);
+#endif
 
 #if defined(__APPLE__) && defined(__MACH__)
 /* Don't include strlcat and strlcpy since they are provided as macros on OSX */