diff --git a/core/net/mac/contikimac/Makefile.core-net-mac-contikimac b/core/net/mac/contikimac/Makefile.core-net-mac-contikimac
new file mode 100644
index 000000000..af20251aa
--- /dev/null
+++ b/core/net/mac/contikimac/Makefile.core-net-mac-contikimac
@@ -0,0 +1 @@
+core-net-mac-contikimac_src = contikimac.c
diff --git a/core/net/mac/contikimac.c b/core/net/mac/contikimac/contikimac.c
similarity index 99%
rename from core/net/mac/contikimac.c
rename to core/net/mac/contikimac/contikimac.c
index 626a9daca..d809ded09 100644
--- a/core/net/mac/contikimac.c
+++ b/core/net/mac/contikimac/contikimac.c
@@ -45,7 +45,7 @@
 #include "dev/watchdog.h"
 #include "lib/random.h"
 #include "net/mac/mac-sequence.h"
-#include "net/mac/contikimac.h"
+#include "net/mac/contikimac/contikimac.h"
 #include "net/netstack.h"
 #include "net/rime.h"
 #include "sys/compower.h"
diff --git a/core/net/mac/contikimac.h b/core/net/mac/contikimac/contikimac.h
similarity index 100%
rename from core/net/mac/contikimac.h
rename to core/net/mac/contikimac/contikimac.h