diff --git a/Makefile b/Makefile
index 0557d69..26cc471 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,16 @@
 CC		?= cc
-WFLAGS		?= -Wall \
+CFLAGS		?= -O2 \
+		   -pipe \
+		   -fstack-protector-strong \
+		   -Wall \
 		   -Wextra \
 		   -Wmissing-declarations \
 		   -pedantic
-SQLCFLAGS	?= $(shell mysql_config --cflags)
-SQLLDFLAGS	+= $(shell mysql_config --libs)
-ifndef CFLAGS
-	OLEVEL ?= -O2
-	CFLAGS += -pipe \
-		  -fstack-protector-strong \
-		  $(OLEVEL) $(WFLAGS)
-endif
+LDFLAGS		?= -lcrypto -lssl \
+		   -lpthread \
+		   -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now
+CFLAGS		+= $(shell mysql_config --cflags)
+LDFLAGS		+= $(shell mysql_config --libs)
 
 # Use this to store compile flags and debug info.
 # You may simply check the flags later with:
@@ -19,11 +19,6 @@ ifeq ($(DEBUG), yes)
 	CFLAGS += -frecord-gcc-switches -g
 endif
 
-ifndef LDFLAGS
-	LDFLAGS	= -O1 -lcrypto -lssl -lpthread
-	LDFLAGS	+= -Wl,-z,relro,-z,now
-endif
-
 SRCDIR		= src
 OBJDIR		= obj
 BUILDDIR	= build
@@ -36,18 +31,18 @@ INSTALLDIR	:= $(DESTDIR)/usr/bin
 
 $(BUILDDIR)/$(EXECUTABLE): $(OBJECTS)
 ifeq ($(VERBOSE), yes)
-	$(CC) $(SQLLDFLAGS) $(LDFLAGS) $(OBJECTS) -o $@
+	$(CC) $(OBJECTS) $(LDFLAGS) -o $@
 else
 	@echo '  LD  $@'
-	@$(CC) $(SQLLDFLAGS) $(LDFLAGS) $(OBJECTS) -o $@
+	@$(CC) $(OBJECTS) $(LDFLAGS) -o $@
 endif
 
 $(OBJECTS): $(OBJDIR)/%.o : $(SRCDIR)/%.c
 ifeq ($(VERBOSE), yes)
-	$(CC) $(CFLAGS) $(SQLCFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) -c $< -o $@
 else
 	@echo '  CC  $<'
-	@$(CC) $(CFLAGS) $(SQLCFLAGS) -c $< -o $@
+	@$(CC) $(CFLAGS) -c $< -o $@
 endif
 
 clean: