diff --git a/mageia/README-short.txt b/mageia/README-short.txt
new file mode 100644
index 000000000..b32de7c53
--- /dev/null
+++ b/mageia/README-short.txt
@@ -0,0 +1 @@
+Official Mageia base image
diff --git a/mageia/README.md b/mageia/README.md
new file mode 100644
index 000000000..c94490917
--- /dev/null
+++ b/mageia/README.md
@@ -0,0 +1,69 @@
+# Supported tags and respective `Dockerfile` links
+
+
+
+# What is Mageia?
+
+[Mageia](http://www.mageia.org) is a GNU/Linux-based, Free Software operating
+system.It is a [community](https://www.mageia.org/en/community/) project,
+supported by [a nonprofit
+organisation](https://www.mageia.org/en/about/#mageia.org) of elected
+contributors.
+
+Our mission: to build great tools for people.
+
+Further than just delivering a secure, stable and sustainable operating system,
+the goal is to set up a stable and trustable governance to direct collaborative
+projects.
+
+To date, Mageia:
+
+- [started in September 2010 as a
+  fork](https://www.mageia.org/en/about/2010-sept-announcement.html) of Mandriva
+  Linux;
+- gathered hundreds of careful individuals and several companies worldwide,who
+  coproduce the infrastructure, the distribution itself,
+  [documentation](https://wiki.mageia.org/),
+  [delivery](https://www.mageia.org/en/downloads/) and
+  [support](https://www.mageia.org/en/support/), using Free Software tools;
+- released four major stable releases in June 2011, in May 2012, in May 2013 and
+  in February 2014.
+
+# How to use this image
+
+## Create a Dockerfile for your container
+
+    FROM mageia:4
+    MAINTAINER  "Foo Bar" <foo@bar.com>
+    CMD [ "bash" ]
+
+## Installed packages
+
+All images install the following packages:
+
+* basesystem-minimal
+* urpmi
+* locales
+* locales-en
+
+# User Feedback
+
+## Issues
+
+If you have any problems with or questions about this image, please contact us
+ through a [GitHub issue](https://github.com/juanluisbaptiste/docker-brew-mageia/issues).
+
+You can also reach many of the official image maintainers via the
+`#docker-library` IRC channel on [Freenode](https://freenode.net).
+
+## Contributing
+
+You are invited to contribute new features, fixes, or updates, large or small;
+we are always thrilled to receive pull requests, and do our best to process them
+as fast as we can.
+
+Before you start to code, we recommend discussing your plans 
+through a [GitHub issue](https://github.com/juanluisbaptiste/docker-brew-mageia/issues), especially for more ambitious
+contributions. This gives other contributors a chance to point you in the right
+direction, give you feedback on your design, and help you find out if someone
+else is working on the same thing.
diff --git a/mageia/content.md b/mageia/content.md
new file mode 100644
index 000000000..05273370c
--- /dev/null
+++ b/mageia/content.md
@@ -0,0 +1,43 @@
+# What is Mageia?
+
+[Mageia](http://www.mageia.org) is a GNU/Linux-based, Free Software operating
+system.It is a [community](https://www.mageia.org/en/community/) project,
+supported by [a nonprofit
+organisation](https://www.mageia.org/en/about/#mageia.org) of elected
+contributors.
+
+Our mission: to build great tools for people.
+
+Further than just delivering a secure, stable and sustainable operating system,
+the goal is to set up a stable and trustable governance to direct collaborative
+projects.
+
+To date, Mageia:
+
+- [started in September 2010 as a
+  fork](https://www.mageia.org/en/about/2010-sept-announcement.html) of Mandriva
+  Linux;
+- gathered hundreds of careful individuals and several companies worldwide,who
+  coproduce the infrastructure, the distribution itself,
+  [documentation](https://wiki.mageia.org/),
+  [delivery](https://www.mageia.org/en/downloads/) and
+  [support](https://www.mageia.org/en/support/), using Free Software tools;
+- released four major stable releases in June 2011, in May 2012, in May 2013 and
+  in February 2014.
+
+# How to use this image
+
+## Create a Dockerfile for your container
+
+    FROM mageia:4
+    MAINTAINER  "Foo Bar" <foo@bar.com>
+    CMD [ "bash" ]
+
+## Installed packages
+
+All images install the following packages:
+
+* basesystem-minimal
+* urpmi
+* locales
+* locales-en
diff --git a/mageia/logo.png b/mageia/logo.png
new file mode 100644
index 000000000..685d9d454
Binary files /dev/null and b/mageia/logo.png differ
diff --git a/update.sh b/update.sh
index db9328a22..eb3881762 100755
--- a/update.sh
+++ b/update.sh
@@ -32,6 +32,7 @@ declare -A otherRepos=(
 	[hylang]='https://github.com/hylang/hy'
 	[jenkins]='https://github.com/cloudbees/jenkins-ci.org-docker'
 	[jruby]='https://github.com/cpuguy83/docker-jruby'
+	[mageia]='https://github.com/juanluisbaptiste/docker-brew-mageia'
 	[neurodebian]='https://github.com/neurodebian/dockerfiles'
 	[nginx]='https://github.com/nginxinc/docker-nginx'
 	[opensuse]='https://github.com/openSUSE/docker-containers-build'