diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn
index 283c4a8c24b4..464c268e544b 160000
--- a/3rdparty/mkldnn
+++ b/3rdparty/mkldnn
@@ -1 +1 @@
-Subproject commit 283c4a8c24b4e1dea05fbc7941594a7375babad1
+Subproject commit 464c268e544bae26f9b85a2acb9122c766a4c396
diff --git a/Jenkinsfile b/Jenkinsfile
index 2bac346c7659..e43b6f0d74d1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -175,6 +175,24 @@ try {
         }
       }
     },
+    'CPU: Clang 3.9 MKLDNN': {
+      node('mxnetlinux-cpu') {
+        ws('workspace/build-cpu-mkldnn-clang39') {
+          init_git()
+          sh "ci/build.py --build --platform ubuntu_cpu /work/runtime_functions.sh build_ubuntu_cpu_clang39_mkldnn"
+          pack_lib('mkldnn_cpu_clang3', mx_mkldnn_lib)
+        }
+      }
+    },
+    'CPU: Clang 5 MKLDNN': {
+      node('mxnetlinux-cpu') {
+        ws('workspace/build-cpu-mkldnn-clang50') {
+          init_git()
+          sh "ci/build.py --build --platform ubuntu_cpu /work/runtime_functions.sh build_ubuntu_cpu_clang50_mkldnn"
+          pack_lib('mkldnn_cpu_clang5', mx_mkldnn_lib)
+        }
+      }
+    },
     'CPU: MKLDNN': {
       node('mxnetlinux-cpu') {
         ws('workspace/build-mkldnn-cpu') {
diff --git a/ci/docker/install/ubuntu_mklml.sh b/ci/docker/install/ubuntu_mklml.sh
index 4f68fa795173..253cf95c6ce0 100755
--- a/ci/docker/install/ubuntu_mklml.sh
+++ b/ci/docker/install/ubuntu_mklml.sh
@@ -21,5 +21,5 @@
 # the whole docker cache for the image
 
 set -ex
-wget --no-check-certificate -O /tmp/mklml.tgz https://github.com/01org/mkl-dnn/releases/download/v0.12/mklml_lnx_2018.0.1.20171227.tgz
+wget --no-check-certificate -O /tmp/mklml.tgz https://github.com/intel/mkl-dnn/releases/download/v0.12/mklml_lnx_2018.0.1.20171227.tgz
 tar -zxvf /tmp/mklml.tgz && cp -rf mklml_*/* /usr/local/ && rm -rf mklml_*
\ No newline at end of file
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 89ea44fa1ef5..14a256dd6ea0 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -205,6 +205,32 @@ build_ubuntu_cpu_clang50() {
         -j$(nproc)
 }
 
+build_ubuntu_cpu_clang39_mkldnn() {
+    set -ex
+    make \
+        USE_PROFILER=1                \
+        USE_CPP_PACKAGE=1             \
+        USE_BLAS=openblas             \
+        USE_MKLDNN=1                  \
+        USE_OPENMP=0                  \
+        CXX=clang++-3.9               \
+        CC=clang-3.9                  \
+        -j$(nproc)
+}
+
+build_ubuntu_cpu_clang50_mkldnn() {
+    set -ex
+    make \
+        USE_PROFILER=1                \
+        USE_CPP_PACKAGE=1             \
+        USE_BLAS=openblas             \
+        USE_MKLDNN=1                  \
+        USE_OPENMP=1                  \
+        CXX=clang++-5.0               \
+        CC=clang-5.0                  \
+        -j$(nproc)
+}
+
 build_ubuntu_cpu_mkldnn() {
     set -ex
     make  \
diff --git a/src/operator/nn/mkldnn/mkldnn_base.cc b/src/operator/nn/mkldnn/mkldnn_base.cc
index edc348273f13..820cca1402c5 100644
--- a/src/operator/nn/mkldnn/mkldnn_base.cc
+++ b/src/operator/nn/mkldnn/mkldnn_base.cc
@@ -237,13 +237,14 @@ mkldnn_memory_format_t GetDefaultFormat(mkldnn::memory::desc desc) {
       case mkldnn_gOIhw16o16i:
       case mkldnn_gIOhw16o16i:
       case mkldnn_gOihw8o:
+      case mkldnn_Goihw8g:
       case mkldnn_gOihw16o:
       case mkldnn_gOhwi8o:
       case mkldnn_gOhwi16o:
       case mkldnn_gOhIw16o4i:
         return mkldnn_goihw;
       default:
-        LOG(FATAL) << "Unknown MKLDNN format for 4 dimensions: " << desc.data.format;
+        LOG(FATAL) << "Unknown MKLDNN format for 5 dimensions: " << desc.data.format;
         return mkldnn_format_undef;
     }
   } else {