diff --git a/Makefile b/Makefile
index 14d3e8f..d687e7e 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ Q         ?= @
 #DO NOT EDIT BELOW
 include $(MAKE_DIR)/config.mk
 include $(MAKE_DIR)/include_$(TAG).mk
+include $(MAKE_DIR)/include_LIKWID.mk
 INCLUDES  += -I./src/includes
 
 VPATH     = $(SRC_DIR)
diff --git a/config.mk b/config.mk
index 9ca4a89..19765ea 100644
--- a/config.mk
+++ b/config.mk
@@ -1,6 +1,7 @@
 # Supported: GCC, CLANG, ICC
 TAG ?= GCC
 ENABLE_OPENMP ?= false
+ENABLE_LIKWID ?= false
 
 #Feature options
 OPTIONS  =  -DSIZE=100000000ull
diff --git a/include_ICC.mk b/include_ICC.mk
index 7d70792..5ba42bc 100644
--- a/include_ICC.mk
+++ b/include_ICC.mk
@@ -5,8 +5,8 @@ ifeq ($(ENABLE_OPENMP),true)
 OPENMP   = -qopenmp
 endif
 
-CFLAGS   = -DLIKWID -DLIKWID_PERFMON -Ofast -xHost -std=c99 -ffreestanding $(OPENMP) $(LIKWID_INC)
-LFLAGS   = $(OPENMP) $(LIKWID_LIB) -llikwid
+CFLAGS   = -Ofast -xHost -std=c99 -ffreestanding $(OPENMP)
+LFLAGS   = $(OPENMP)
 DEFINES  = -D_GNU_SOURCE
 INCLUDES =
 LIBS     =
diff --git a/include_LIKWID.mk b/include_LIKWID.mk
new file mode 100644
index 0000000..f16561b
--- /dev/null
+++ b/include_LIKWID.mk
@@ -0,0 +1,11 @@
+LIKWID_INC ?= -I/usr/local/include
+LIKWID_DEFINES ?= -DLIKWID_PERFMON
+LIKWID_LIB ?= -L/usr/local/lib
+
+
+ifeq ($(strip $(ENABLE_LIKWID)),true)
+INCLUDES += ${LIKWID_INC}
+DEFINES += -DLIKWID ${LIKWID_DEFINES}
+LIBS += -llikwid
+LFLAGS += ${LIKWID_LIB}
+endif