diff --git a/.travis.yml b/.travis.yml
index 5baee546d..ff2e09b83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,10 +21,12 @@ env:
   - TR_ARCH=alpine      CLANG=1
   - TR_ARCH=docker-test
   - TR_ARCH=fedora-rawhide
+  - TR_ARCH=fedora-rawhide-aarch64
 matrix:
   allow_failures:
     - env: TR_ARCH=docker-test
     - env: TR_ARCH=fedora-rawhide
+    - env: TR_ARCH=fedora-rawhide-aarch64
 script:
   - sudo make CCACHE=1 -C scripts/travis $TR_ARCH
 after_success:
diff --git a/scripts/build/Dockerfile.fedora-rawhide-aarch64.hdr b/scripts/build/Dockerfile.fedora-rawhide-aarch64.hdr
new file mode 100644
index 000000000..82f29e336
--- /dev/null
+++ b/scripts/build/Dockerfile.fedora-rawhide-aarch64.hdr
@@ -0,0 +1,3 @@
+FROM arm64v8/fedora:rawhide
+
+COPY scripts/build/qemu-user-static/usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
diff --git a/scripts/build/Dockerfile.fedora-rawhide-aarch64.tmpl b/scripts/build/Dockerfile.fedora-rawhide-aarch64.tmpl
new file mode 120000
index 000000000..e4c40309c
--- /dev/null
+++ b/scripts/build/Dockerfile.fedora-rawhide-aarch64.tmpl
@@ -0,0 +1 @@
+Dockerfile.fedora.tmpl
\ No newline at end of file
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index 21330be77..dbf599de3 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -1,4 +1,4 @@
-QEMU_ARCHES := armv7hf aarch64 ppc64le s390x # require qemu
+QEMU_ARCHES := armv7hf aarch64 ppc64le s390x fedora-rawhide-aarch64 # require qemu
 ARCHES := $(QEMU_ARCHES) x86_64 fedora-asan fedora-rawhide
 TARGETS := $(ARCHES) alpine
 TARGETS_CLANG := $(addsuffix $(TARGETS),-clang)
@@ -38,8 +38,6 @@ endef
 $(foreach t,$(TARGETS),$(eval $(call CLANG_DEP,$(t))))
 
 %-clang:	DB_CC=--build-arg CC=clang
-Dockerfile.fedora-asan: override DOCKER_TMPL=Dockerfile.fedora.tmpl
-Dockerfile.fedora-rawhide: override DOCKER_TMPL=Dockerfile.fedora.tmpl
 %-clang:	DB_ENV=--build-arg ENV1=CCACHE_CPP2
 s390x-clang:	DB_CC=--build-arg CC=clang-3.8
 .PHONY: $(TARGETS_CLANG)