diff --git a/README.md b/README.md
index 26098629fc..d538819d13 100644
--- a/README.md
+++ b/README.md
@@ -50,3 +50,18 @@ For example, on Fedora 21 mock reports the following:
 INFO: Done(scylla-server-0.00-1.fc21.src.rpm) Config(default) 20 minutes 7 seconds
 INFO: Results and/or logs in: /var/lib/mock/fedora-21-x86_64/result
 ```
+
+## Building Fedora-based Docker image
+
+Build a Docker image with:
+
+```
+cd dist/docker
+docker build -t <image-name> .
+```
+
+Run the image with:
+
+```
+docker run -i -t <image name>
+```
diff --git a/dist/docker/Dockerfile b/dist/docker/Dockerfile
new file mode 100644
index 0000000000..12c0823a55
--- /dev/null
+++ b/dist/docker/Dockerfile
@@ -0,0 +1,16 @@
+FROM fedora:22
+
+MAINTAINER Avi Kivity <avi@cloudius-systems.com>
+
+ADD scylla.repo /etc/yum.repos.d/
+RUN dnf -y update
+RUN dnf -y install scylla-server
+RUN dnf clean all
+ADD start-scylla /start-scylla
+RUN chown scylla /start-scylla
+
+USER scylla
+EXPOSE 10000 9042 9160 7000 7001
+VOLUME /var/lib/scylla
+
+CMD /start-scylla
diff --git a/dist/docker/scylla.repo b/dist/docker/scylla.repo
new file mode 100644
index 0000000000..04a904224a
--- /dev/null
+++ b/dist/docker/scylla.repo
@@ -0,0 +1,11 @@
+[scylla]
+name=Scylla for Fedora $releasever - $basearch
+baseurl=https://s3.amazonaws.com/downloads.scylladb.com/rpm/fedora/$releasever/$basearch/
+enabled=1
+gpgcheck=0
+
+[scylla-generic]
+name=Scylla for Fedora $releasever
+baseurl=https://s3.amazonaws.com/downloads.scylladb.com/rpm/fedora/$releasever/noarch/
+enabled=1
+gpgcheck=0
diff --git a/dist/docker/start-scylla b/dist/docker/start-scylla
new file mode 100755
index 0000000000..5b93caf2c0
--- /dev/null
+++ b/dist/docker/start-scylla
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+IP=$(hostname -i)
+sed -e "s/seeds:.*/seeds: $IP/g" /var/lib/scylla/conf/scylla.yaml > $HOME/scylla.yaml
+/usr/bin/scylla --log-to-syslog 1 \
+                --log-to-stdout 0 \
+                --default-log-level info \
+                --options-file $HOME/scylla.yaml \
+                --listen-address $IP \
+                --rpc-address $IP \
+                --network-stack posix