diff --git a/envoy-fedora/Dockerfile.in b/envoy-fedora/Dockerfile.in
new file mode 100644
index 0000000..924917d
--- /dev/null
+++ b/envoy-fedora/Dockerfile.in
@@ -0,0 +1,7 @@
+FROM FROM_IMAGE
+
+RUN dnf install -y 'dnf-command(copr)' && \
+	dnf copr enable -y vbatts/envoy && \
+	dnf install -y envoy && \
+	dnf update -y && \
+	dnf clean all
diff --git a/envoy-fedora/Makefile b/envoy-fedora/Makefile
new file mode 100644
index 0000000..21a5635
--- /dev/null
+++ b/envoy-fedora/Makefile
@@ -0,0 +1,30 @@
+
+DOCKER		?= $(shell which docker)
+FROM_IMAGE	?= fedora
+#FROM_TAG	?= 21
+FROM_TAG	?= latest
+FROM		:= $(FROM_IMAGE):$(FROM_TAG)
+REGISTRY	?= docker.io
+NAME		?= $(REGISTRY)/$(USER)/envoy-$(FROM_IMAGE):$(FROM_TAG)
+
+default: build
+
+Dockerfile: Dockerfile.in
+	m4 \
+	--define=FROM_IMAGE=$(FROM) \
+	$< > $@
+
+build: .build
+
+.build: Dockerfile .pull
+	$(DOCKER) build -t $(NAME) . && touch $@
+
+pull: .pull
+
+.pull:
+	$(DOCKER) pull $(FROM) && touch $@
+
+clean:
+	rm -rf .build .pull Dockerfile *~
+
+