diff --git a/Makefile.dep b/Makefile.dep
index afa5b34ae..eff649d8a 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -79,6 +79,12 @@ ifneq (,$(filter destiny,$(USEMODULE)))
 	endif
 endif
 
+ifneq (,$(filter sixlowborder,$(USEMODULE)))
+	ifeq (,$(filter sixlowpan,$(USEMODULE)))
+		USEMODULE += sixlowpan
+	endif
+endif
+
 ifneq (,$(filter sixlowpan,$(USEMODULE)))
 	ifeq (,$(filter ieee802154,$(USEMODULE)))
 		USEMODULE += ieee802154
diff --git a/sys/Makefile b/sys/Makefile
index 0614547c7..69bc1a233 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -57,6 +57,9 @@ endif
 ifneq (,$(filter sixlowpan,$(USEMODULE)))
     DIRS += net/network_layer/sixlowpan
 endif
+ifneq (,$(filter sixlowborder,$(USEMODULE)))
+    DIRS += net/network_layer/sixlowpan/border
+endif
 ifneq (,$(filter rpl,$(USEMODULE)))
     DIRS += net/routing/rpl
 endif
diff --git a/sys/net/network_layer/sixlowpan/border.c b/sys/net/network_layer/sixlowpan/border/border.c
similarity index 100%
rename from sys/net/network_layer/sixlowpan/border.c
rename to sys/net/network_layer/sixlowpan/border/border.c
diff --git a/sys/net/network_layer/sixlowpan/border.h b/sys/net/network_layer/sixlowpan/border/border.h
similarity index 100%
rename from sys/net/network_layer/sixlowpan/border.h
rename to sys/net/network_layer/sixlowpan/border/border.h
diff --git a/sys/net/network_layer/sixlowpan/bordermultiplex.c b/sys/net/network_layer/sixlowpan/border/bordermultiplex.c
similarity index 100%
rename from sys/net/network_layer/sixlowpan/bordermultiplex.c
rename to sys/net/network_layer/sixlowpan/border/bordermultiplex.c
diff --git a/sys/net/network_layer/sixlowpan/bordermultiplex.h b/sys/net/network_layer/sixlowpan/border/bordermultiplex.h
similarity index 100%
rename from sys/net/network_layer/sixlowpan/bordermultiplex.h
rename to sys/net/network_layer/sixlowpan/border/bordermultiplex.h
diff --git a/sys/net/network_layer/sixlowpan/flowcontrol.c b/sys/net/network_layer/sixlowpan/border/flowcontrol.c
similarity index 100%
rename from sys/net/network_layer/sixlowpan/flowcontrol.c
rename to sys/net/network_layer/sixlowpan/border/flowcontrol.c
diff --git a/sys/net/network_layer/sixlowpan/flowcontrol.h b/sys/net/network_layer/sixlowpan/border/flowcontrol.h
similarity index 100%
rename from sys/net/network_layer/sixlowpan/flowcontrol.h
rename to sys/net/network_layer/sixlowpan/border/flowcontrol.h
diff --git a/sys/net/network_layer/sixlowpan/lowpan.c b/sys/net/network_layer/sixlowpan/lowpan.c
index 1af050f70..e0b6b95b5 100644
--- a/sys/net/network_layer/sixlowpan/lowpan.c
+++ b/sys/net/network_layer/sixlowpan/lowpan.c
@@ -36,7 +36,9 @@
 #include "sixlowpan/ndp.h"
 
 #include "lowpan.h"
-#include "border.h"
+#ifdef MODULE_SIXLOWBORDER
+#include "border/border.h"
+#endif
 #include "ip.h"
 #include "icmp.h"