diff --git a/cpu/mc1322x/Makefile.mc1322x b/cpu/mc1322x/Makefile.mc1322x
index 724570a13..dd9d48162 100644
--- a/cpu/mc1322x/Makefile.mc1322x
+++ b/cpu/mc1322x/Makefile.mc1322x
@@ -74,9 +74,9 @@ CFLAGS += -I$(OBJECTDIR) -I$(CONTIKI_CPU)/board -DBOARD=$(TARGET)
 $(OBJECTDIR)/board.h: $(OBJECTDIR) 
 ifneq (,$(findstring Windows,$(OS)))
 	${info Cygwin detected.}
-	ln -f $(CONTIKI_CPU)/board/$(TARGET).h $(OBJECTDIR)/board.h
+	ln -f $(CONTIKI_CPU)/board/board.h $(OBJECTDIR)/board.h
 else
-	ln -sf ../$(CONTIKI_CPU)/board/$(TARGET).h $(OBJECTDIR)/board.h
+	ln -sf ../$(CONTIKI_CPU)/board/board.h $(OBJECTDIR)/board.h
 endif
 
 
diff --git a/cpu/mc1322x/board/Makefile.board b/cpu/mc1322x/board/Makefile.board
deleted file mode 100644
index a5b2cb800..000000000
--- a/cpu/mc1322x/board/Makefile.board
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- makefile -*-
-
-BOARDS := redbee-dev redbee-r1 redbee-usb redbee-econotag quahogcon freescale-ncb
-
-OBJDIR := obj_$(BOARD)_board
-CFLAGS += -I$(OBJDIR) -I$(MC1322X)/board -DBOARD=$(BOARD)
-
-$(OBJDIR):
-ifndef BOARD
-	${warning BOARD not defined}
-	${warning echo "make BOARD=foo"}
-	${warning "boards: $(BOARDS)"}
-	${error you must define BOARD}
-endif
-	@echo "setup object directory for dev board"
-	mkdir $(OBJDIR)
-
-$(OBJDIR)/board.h: $(OBJDIR) 
-	ln -sf ../$(MC1322X)/board/$(BOARD).h $(OBJDIR)/board.h
-
diff --git a/cpu/mc1322x/board/board.h b/cpu/mc1322x/board/board.h
new file mode 100644
index 000000000..7ecf4a389
--- /dev/null
+++ b/cpu/mc1322x/board/board.h
@@ -0,0 +1,8 @@
+#ifndef BOARD
+BOARD = redbee-econotag
+#endif
+
+#if BOARD == redbee-econotag
+#include "redbee-econotag.h"
+#endif
+