diff --git a/sys/Makefile b/sys/Makefile
index f6f463e0f89e1f6d5c60893c33390876ee3357b0..216161d38299aa48a253f59dded73e64e8cf3f60 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -62,7 +62,7 @@ ifneq (,$(findstring net_help,$(USEMODULE)))
     DIRS += net/net_help
 endif
 ifneq (,$(findstring protocol_multiplex,$(USEMODULE)))
-    DIRS += net/protocol-multiplex
+    DIRS += net/link_layer/protocol-multiplex
 endif
 ifneq (,$(findstring sixlowpan,$(USEMODULE)))
     DIRS += net/sixlowpan
diff --git a/sys/net/protocol-multiplex/Makefile b/sys/net/link_layer/protocol-multiplex/Makefile
similarity index 100%
rename from sys/net/protocol-multiplex/Makefile
rename to sys/net/link_layer/protocol-multiplex/Makefile
diff --git a/sys/net/protocol-multiplex/protocol-multiplex.c b/sys/net/link_layer/protocol-multiplex/protocol-multiplex.c
similarity index 100%
rename from sys/net/protocol-multiplex/protocol-multiplex.c
rename to sys/net/link_layer/protocol-multiplex/protocol-multiplex.c