diff --git a/Makefile b/Makefile
index 4d7ee3c..b0c79bd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 UBUNTU_BOXES= precise quantal raring saucy trusty utopic vivid
 DEBIAN_BOXES= squeeze wheezy sid jessie
 CENTOS_BOXES= 6
-FEDORA_BOXES= 21 20 19
+FEDORA_BOXES= rawhide 21 20 19
 TODAY=$(shell date -u +"%Y-%m-%d")
 
 # Replace i686 with i386 and x86_64 with amd64
diff --git a/common/download.sh b/common/download.sh
index 6204ed9..14373bf 100755
--- a/common/download.sh
+++ b/common/download.sh
@@ -34,7 +34,12 @@ elif [ $RELEASE = 'squeeze' ] || [ $RELEASE = 'wheezy' ]; then
   utils.lxc.create -t debian -- \
                    --release ${RELEASE} \
                    --arch ${ARCH}
-elif [ ${DISTRIBUTION} = 'fedora' -a ${RELEASE} = '21' ]; then
+elif [ ${DISTRIBUTION} = 'fedora' -a "${RELEASE}" = 'rawhide' ]; then
+  ARCH=$(echo ${ARCH} | sed -e "s/38/68/" | sed -e "s/amd64/x86_64/")
+  utils.lxc.create -t fedora --\
+                   --release ${RELEASE} \
+                   --arch ${ARCH}
+elif [ ${DISTRIBUTION} = 'fedora' -a ${RELEASE} -ge '21' ]; then
   ARCH=$(echo ${ARCH} | sed -e "s/38/68/" | sed -e "s/amd64/x86_64/")
   utils.lxc.create -t fedora --\
                    --release ${RELEASE} \