diff --git a/Makefile b/Makefile
index 262a036..d44d3ae 100644
--- a/Makefile
+++ b/Makefile
@@ -12,9 +12,9 @@ include config
 export O?=$(abspath build)
 
 # Include base system
-include sys/conf.mk
+include etc/make/conf.mk
 # Arch details
-include sys/$(ARCH)/conf.mk
+include etc/make/$(ARCH)/conf.mk
 
 all: mkdirs config $(TARGETS)
 
diff --git a/sys/amd64/compiler.mk b/etc/make/amd64/compiler.mk
similarity index 100%
rename from sys/amd64/compiler.mk
rename to etc/make/amd64/compiler.mk
diff --git a/sys/amd64/conf.mk b/etc/make/amd64/conf.mk
similarity index 99%
rename from sys/amd64/conf.mk
rename to etc/make/amd64/conf.mk
index b7575e5..8d45602 100644
--- a/sys/amd64/conf.mk
+++ b/etc/make/amd64/conf.mk
@@ -1,4 +1,4 @@
-include sys/amd64/compiler.mk
+include etc/make/amd64/compiler.mk
 
 .PHONY+=$(O)/sys/amd64/hw/ap_code_blob.o
 
diff --git a/sys/conf.mk b/etc/make/conf.mk
similarity index 100%
rename from sys/conf.mk
rename to etc/make/conf.mk