diff --git a/Makefile b/Makefile
index 624b2e1..3883ed9 100755
--- a/Makefile
+++ b/Makefile
@@ -12,19 +12,20 @@ SRC= confparse/util.c      \
      input.c  \
      hftirc.h
 
-CFLAGS+=-Wall -g -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE -D_XOPEN_CURSES -I/usr/include/libircclient
-LDFLAGS+=-lncursesw /usr/lib/libircclient.a
+CFLAGS+=-Wall -g -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE -D_XOPEN_CURSES
+LDFLAGS+=-lncursesw
 
 OBJ=$(SRC:.c=.o)
 UNAME=$(shell uname)
 
 ifeq ($(UNAME),Linux)
-	CFLAGS += -D_GNU_SOURCE
+	CFLAGS+=-D_GNU_SOURCE -I/usr/include/libircclient
+	LDFLAGS+=/usr/lib/libircclient.a
 endif
 
 ifeq ($(UNAME),FreeBSD)
     CFLAGS+=-I/usr/local/include
-    LDFLAGS+=-L/usr/local/lib
+    LDFLAGS+=-L/usr/local/lib /usr/local/lib/libircclient.a
 endif
 
 all: $(EXEC)