diff --git a/sys/Makefile b/sys/Makefile
index 1332d17a1..33694b1bb 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -77,9 +77,13 @@ ifneq (,$(findstring protocol-multiplex,$(USEMODULE)))
     DIRS += net/protocol-multiplex
 endif
 ifneq (,$(findstring sixlowpan,$(USEMODULE)))
+    DIRS += net/ieee802154
     DIRS += net/sixlowpan
     DIRS += net/sixlowpan/rpl
 endif
+ifneq (,$(findstring ieee802154,$(USEMODULE)))
+    DIRS += net/ieee802154
+endif
 
 all: $(BINDIR)$(MODULE).a 
 	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
diff --git a/sys/net/ieee802154/Makefile b/sys/net/ieee802154/Makefile
new file mode 100644
index 000000000..7dce69248
--- /dev/null
+++ b/sys/net/ieee802154/Makefile
@@ -0,0 +1,4 @@
+MODULE:=$(shell basename $(CURDIR))
+INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/net
+
+include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/sixlowpan/ieee802154_frame.c b/sys/net/ieee802154/ieee802154_frame.c
similarity index 100%
rename from sys/net/sixlowpan/ieee802154_frame.c
rename to sys/net/ieee802154/ieee802154_frame.c
diff --git a/sys/net/sixlowpan/ieee802154_frame.h b/sys/net/ieee802154/ieee802154_frame.h
similarity index 100%
rename from sys/net/sixlowpan/ieee802154_frame.h
rename to sys/net/ieee802154/ieee802154_frame.h