diff --git a/teradatalabs/mapr-client/Dockerfile b/teradatalabs/mapr-client/Dockerfile
new file mode 100644
index 0000000..57882fb
--- /dev/null
+++ b/teradatalabs/mapr-client/Dockerfile
@@ -0,0 +1,20 @@
+# Copyright 2017 Teradata
+#
+# 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+
+FROM teradatalabs/centos6-java8-oracle
+MAINTAINER Teradata Docker Team <docker@teradata.com>
+
+ADD files/maprtech.repo /etc/yum.repos.d/maprtech.repo
+RUN yum update -y \
+  && yum install -y mapr-client.x86_64
diff --git a/teradatalabs/mapr-client/README.md b/teradatalabs/mapr-client/README.md
new file mode 100644
index 0000000..c2986b8
--- /dev/null
+++ b/teradatalabs/mapr-client/README.md
@@ -0,0 +1,14 @@
+# mapr-client [![][layers-badge]][layers-link] [![][version-badge]][dockerhub-link]
+
+[layers-badge]: https://images.microbadger.com/badges/image/teradatalabs/mapr-client.svg
+[layers-link]: https://microbadger.com/images/teradatalabs/mapr-client
+[version-badge]: https://images.microbadger.com/badges/version/teradatalabs/mapr-client.svg
+[dockerhub-link]: https://hub.docker.com/r/teradatalabs/mapr-client
+
+
+Docker image with MapR Client installed.
+
+## Oracle license
+
+By using this image, you accept the Oracle Binary Code License Agreement for Java SE available here:
+[http://www.oracle.com/technetwork/java/javase/terms/license/index.html](http://www.oracle.com/technetwork/java/javase/terms/license/index.html)
diff --git a/teradatalabs/mapr-client/files/maprtech.repo b/teradatalabs/mapr-client/files/maprtech.repo
new file mode 100644
index 0000000..b3bae31
--- /dev/null
+++ b/teradatalabs/mapr-client/files/maprtech.repo
@@ -0,0 +1,6 @@
+[maprtech]
+name=MapR Technologies
+baseurl=http://package.mapr.com/releases/v5.2.0/redhat/
+enabled=1
+gpgcheck=0
+protect=1