diff --git a/tools/release-tools/Makefile b/tools/release-tools/Makefile
index 17a677075..7168695db 100644
--- a/tools/release-tools/Makefile
+++ b/tools/release-tools/Makefile
@@ -1,14 +1,24 @@
-ifndef RELEASE
-  ${error You must specify the RELEASE variable (e.g. make RELEASE=2.2)}
+ifndef TAG
+  ifndef RELEASE
+    ${error You must specify the RELEASE variable (e.g. make RELEASE=2.2)}
+  endif
+  RELEASETAG=$(subst .,-,$(RELEASE))
+  TAG=contiki-$(RELEASETAG)
+else
+  RELEASE=$(TAG)
 endif
 
-RELEASETAG=$(subst .,-,$(RELEASE))
-USERNAME=:pserver:anonymous
-CVSROOT=$(USERNAME)@contiki.cvs.sourceforge.net:/cvsroot/contiki
+ifndef CVSUSER
+  CVSUSER=:pserver:anonymous
+endif
 
-package: clean export copy tgz zip collectpack almost-clean
+CVSROOT=$(CVSUSER)@contiki.cvs.sourceforge.net:/cvsroot/contiki
 
-test: clean checkout compile
+package: export-package almost-clean
+
+test: export-package compile almost-clean
+
+export-package: clean export copy tgz zip collectpack avr-raven-pack
 
 almost-clean:
 	rm -rf contiki-2.x contiki-$(RELEASE) contiki-collect-$(RELEASE)
@@ -38,10 +48,10 @@ compile:
 	(cd contiki-2.x/examples/compile-platforms; make)
 
 checkout:
-	cvs -d $(CVSROOT) co -r contiki-$(RELEASETAG) contiki-2.x
+	cvs -d $(CVSROOT) co -r $(TAG) contiki-2.x
 
 export:
-	cvs -d $(CVSROOT) export -r contiki-$(RELEASETAG) contiki-2.x
+	cvs -d $(CVSROOT) export -r $(TAG) contiki-2.x
 
 contiki-collect:
 	(cd contiki-2.x/examples/sky-shell; make sky-shell.ihex; ant dist; chmod 755 dist/tools/*-linux)
@@ -52,3 +62,18 @@ collectpack: contiki-collect
 	chmod 644 contiki-collect-$(RELEASE).tar.gz
 	zip -r contiki-collect-$(RELEASE).zip contiki-collect-$(RELEASE)
 	chmod 644 contiki-collect-$(RELEASE).zip
+
+avr-raven:
+	(cd contiki-2.x/examples/webserver-ipv6-raven; make)
+	(cd contiki-2.x/platform/avr-ravenlcd; make)
+	(cd contiki-2.x/examples/ravenusbstick; make)
+	mkdir contiki-raven-uipv6-$(RELEASE)
+	cp contiki-2.x/examples/webserver-ipv6-raven/webserver6.elf contiki-raven-uipv6-$(RELEASE)
+	cp contiki-2.x/platform/avr-ravenlcd/ravenlcd_3290.elf contiki-raven-uipv6-$(RELEASE)
+	cp contiki-2.x/examples/ravenusbstick/ravenusbstick.elf contiki-raven-uipv6-$(RELEASE)
+
+avr-raven-pack: avr-raven
+	tar czf contiki-raven-uipv6-$(RELEASE).tar.gz contiki-raven-uipv6-$(RELEASE)
+	chmod 644 contiki-raven-uipv6-$(RELEASE).tar.gz
+	zip -r contiki-raven-uipv6-$(RELEASE).zip contiki-raven-uipv6-$(RELEASE)
+	chmod 644 contiki-raven-uipv6-$(RELEASE).zip