diff --git a/Makefile b/Makefile
index afb3c698..5536b0f3 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ endif
 TARGETS := tools crt rpl
 
 DESTDIR ?= $(CURDIR)
-INSTALLDIR := $(shell cd ${DESTDIR} ; pwd)
+INSTALLDIR := $(DESTDIR)
 
 export WUT_ROOT
 export INSTALLDIR
@@ -21,8 +21,6 @@ all:
 	done
 
 clean:
-	@rm -rf lib
-	@rm -rf bin
 	@for dir in $(TARGETS); do \
 		echo; \
 		echo Cleaning $$dir; \
@@ -31,7 +29,7 @@ clean:
 
 install:
 	@mkdir -p $(INSTALLDIR)
-	@cp -r include $(INSTALLDIR)
+	@cp -r include $(INSTALLDIR) || :
 	@for dir in $(TARGETS); do \
 		echo; \
 		echo Installing $$dir; \
diff --git a/crt/Makefile b/crt/Makefile
index a8570488..adcbbcb1 100644
--- a/crt/Makefile
+++ b/crt/Makefile
@@ -15,6 +15,10 @@ install: all
 	@mkdir -p $(INSTALLDIR)/lib
 	@cp -f *.a $(INSTALLDIR)/lib
 
+%.o: %.c
+	@echo "[CC]  $(notdir $<)"
+	@$(CC) $(CFLAGS) -c $< -o $@
+
 %.o: %.S
 	@echo "[CC]  $(notdir $<)"
 	@$(CC) $(CFLAGS) -c $< -o $@
diff --git a/rpl/libcoreinit/fs_dev.c b/crt/fs_dev.c
similarity index 100%
rename from rpl/libcoreinit/fs_dev.c
rename to crt/fs_dev.c