diff --git a/Makefile b/Makefile
index 43fc781..81cf136 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,11 @@ clean-emacs:
 
 clean: CLEANING=yes
 clean:
-	-rm -v $(OBJ_FILES) $(DEP_FILES)
+	-rm -v \
+		$(OBJ_FILES) \
+		$(DEP_FILES) \
+		$(ATRIP_SHARED_LIBRARY) \
+		$(ATRIP_STATIC_LIBRARY)
 
 clean-all: CLEANING=yes
 clean-all: bench-clean clean-emacs clean clean-extern
@@ -102,4 +106,5 @@ html: $(HTML_MAIN)
 
 .PHONY: dbg
 dbg: include/dbg.h
-	wget https://raw.githubusercontent.com/sharkdp/dbg-macro/master/dbg.h -O $<
+include/dbg.h:
+	wget -O $@ "https://raw.githubusercontent.com/sharkdp/dbg-macro/master/dbg.h"
diff --git a/etc/config/icc-debug.mk b/etc/config/icc-debug.mk
new file mode 100644
index 0000000..cd0e32d
--- /dev/null
+++ b/etc/config/icc-debug.mk
@@ -0,0 +1,25 @@
+include etc/make/ctf.mk
+
+CXX = mpic++
+
+bench: static
+
+CTF_CONFIG_FLAGS = CXX=$(CXX) \
+                   CXXFLAGS="-O3" \
+                   LIBS="-lmkl" \
+                   --no-dynamic
+
+CXXFLAGS += -I$(ATRIP_ROOT)/include
+
+CXXFLAGS += -I$(CTF_INCLUDE_PATH)
+CXXFLAGS += -fPIC
+CXXFLAGS += -g -O0
+
+MKL_LIB = -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
+LDFLAGS += -qopenmp -mkl
+LDFLAGS += -lpthread -std=c++11
+LDFLAGS += $(MKL_LIB)
+LDFLAGS += -L$(CTF_BUILD_PATH)/lib -lctf
+
+bench: CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS))
+bench: LDFLAGS += -L$(dir $(ATRIP_STATIC_LIBRARY)) -latrip
diff --git a/etc/config/icc.mk b/etc/config/icc.mk
index e1e568c..e009ca4 100644
--- a/etc/config/icc.mk
+++ b/etc/config/icc.mk
@@ -6,7 +6,6 @@ bench: static
 
 CTF_CONFIG_FLAGS = CXX=$(CXX) \
                    CXXFLAGS="-O3" \
-                   LIBS="-lmkl" \
                    --no-dynamic
 
 CXXFLAGS += -I$(ATRIP_ROOT)/include
@@ -22,4 +21,4 @@ LDFLAGS += $(MKL_LIB)
 LDFLAGS += -L$(CTF_BUILD_PATH)/lib -lctf
 
 bench: CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS))
-bench: LDFLAGS += -Llib/ -latrip
+bench: LDFLAGS += -L$(dir $(ATRIP_STATIC_LIBRARY)) -latrip