diff --git a/elixir/README-short.txt b/elixir/README-short.txt
new file mode 100644
index 000000000..ebce93a9d
--- /dev/null
+++ b/elixir/README-short.txt
@@ -0,0 +1 @@
+Elixir is a dynamic, functional language for building scalable and maintainable applications.
\ No newline at end of file
diff --git a/elixir/content.md b/elixir/content.md
new file mode 100644
index 000000000..23fc1d08e
--- /dev/null
+++ b/elixir/content.md
@@ -0,0 +1,38 @@
+# What is Elixir?
+
+Elixir is a dynamic, functional language designed for building scalable and maintainable applications.
+
+Elixir leverages the Erlang VM, known for running low-latency, distributed and fault-tolerant systems, while also being successfully used in web development and the embedded software domain.
+
+> [en.wikipedia.org/wiki/Elixir_(programming_language)](https://en.wikipedia.org/wiki/Elixir_%28programming_language%29)
+
+%%LOGO%%
+
+# How to use this image
+
+## Run it as the REPL
+
+```console
+➸ docker run -it --rm elixir
+Erlang/OTP 18 [erts-7.2.1] [source] [64-bit] [smp:8:8] [async-threads:10] [hipe] [kernel-poll:false]
+
+Interactive Elixir (1.2.1) - press Ctrl+C to exit (type h() ENTER for help)
+iex(1)> System.version
+"1.2.1"
+iex(2)>
+➸ docker run -it --rm -h elixir.local elixir iex --sname snode
+Erlang/OTP 18 [erts-7.2.1] [source] [64-bit] [smp:8:8] [async-threads:10] [hipe] [kernel-poll:false]
+
+Interactive Elixir (1.2.1) - press Ctrl+C to exit (type h() ENTER for help)
+iex(snode@elixir)1> System.version
+"1.2.1"
+iex(snode@elixir)2> :c.uptime
+14 seconds
+:ok
+```
+
+## Run a single Elixir exs script
+
+```console
+$ docker run -it --rm --name %%REPO%%-inst1 -v "$PWD":/usr/src/myapp -w /usr/src/myapp %%REPO%% elixir your-escript.exs
+```
diff --git a/elixir/license.md b/elixir/license.md
new file mode 100644
index 000000000..f86d7a42d
--- /dev/null
+++ b/elixir/license.md
@@ -0,0 +1,7 @@
+Copyright 2012 Plataformatec
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+
+View [license information](http://www.apache.org/licenses/LICENSE-2.0) for the software contained in this image.
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
diff --git a/elixir/logo.png b/elixir/logo.png
new file mode 100644
index 000000000..003479fd8
Binary files /dev/null and b/elixir/logo.png differ
diff --git a/update.sh b/update.sh
index ca06873b3..698b32656 100755
--- a/update.sh
+++ b/update.sh
@@ -32,6 +32,7 @@ declare -A otherRepos=(
 	[crux]='https://github.com/therealprologic/docker-crux'
 	[debian]='https://github.com/tianon/docker-brew-debian'
 	[docker-dev]='https://github.com/docker/docker'
+	[elixir]='https://github.com/c0b/docker-elixir'
 	[erlang]='https://github.com/c0b/docker-erlang-otp'
 	[fedora]='https://github.com/lsm5/docker-brew-fedora'
 	[gazebo]='https://github.com/osrf/docker_images'