diff --git a/src/project/build.scala b/src/project/build.scala
index e9b75ac345..4abe95180f 100644
--- a/src/project/build.scala
+++ b/src/project/build.scala
@@ -24,6 +24,7 @@ object Extras {
   def defaultOrg = "com.microsoft.ml.spark"
   def scalaVer = env("SCALA_FULL_VERSION", null)
   def sparkVer = env("SPARK_VERSION", null)
+  def cntkVer  = env("CNTK_VERSION", null)
 
   def commonLibs = Seq(
     "org.apache.spark"   %% "spark-core"   % sparkVer % "provided",
@@ -31,7 +32,7 @@ object Extras {
     "org.scalatest"      %% "scalatest"    % "3.0.0"  % "provided",
     // should include these things in the distributed jar
     "io.spray"           %% "spray-json"   % "1.3.2",
-    "com.microsoft.cntk"  % "cntk"         % "2.1",
+    "com.microsoft.cntk"  % "cntk"         % cntkVer,
     "org.openpnp"         % "opencv"       % "3.2.0-1"
     // needed for wasb access, but it collides with the version that comes with Spark,
     // so it gets installed manually for now (see "tools/config.sh")
diff --git a/tools/config.sh b/tools/config.sh
index 7d93f8302d..203afd44c3 100644
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -93,14 +93,12 @@ INSTALLATIONS=(
   vers:   "cat version|<{ver}>"
   where:  "devel build"
 
-  # Note: this is different than the version defined in SBT to avoid breaking
-  # work in progress; but when that's done, we need to sync up the two version
-  # via a shared version seetting so they cannot diverge.
-  CNTK ver: "beta12"
-  url:    "$INSTALLER_URL/CNTK-2-0-<{ver}>-0-Linux-64bit-CPU-Only.tar.gz"
-  sha256: "033c5da4b3034f51d0bde6f0d926f7d075a146b16e7c6148a38cecba928efc6c"
+  CNTK ver: "2.1"
+  url:    "$INSTALLER_URL/CNTK-2-1-Linux-64bit-CPU-Only.tar.gz"
+  sha256: "6fef06b6c9b9bdb782c0d3c4b860c7f7834a04bdf02a6e79938551dfaceea3c1"
   exes:   "cntk"
-  vers:   "cntk|*Built time: Feb 22 2017 13:29:08"
+  # Note: no good way to find the installed version, see cntk pr #2228
+  vers:   "ls cntk/lib/libCntk.Core-*.so|*/libCntk.Core-<{ver}>.so"
   bindir: "cntk/bin"
   where:  "devel build"
 
diff --git a/tools/misc/mmlspark.svg b/tools/misc/mmlspark.svg
index 2c3e4512eb..97260420de 100644
--- a/tools/misc/mmlspark.svg
+++ b/tools/misc/mmlspark.svg
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1">
-  <g>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
+     width="262" height="200" viewbox="0 0 242 180">
+  <g transform="translate(10,10)">
     <path style="fill:#00bbf1;fill-opacity:1;stroke:none"
-          d="M -190.5,371.08333 H 105.83333 L 21.166667,286.41667 Z" />
-    <path style="fill:#00bbf1;fill-opacity:1;stroke:none"
-          d="M 153.45833,371.08333 52.916667,270.54167 153.45833,-105.16667 Z" />
+          d="M 130,180 v -180 l -38,142 Z" />
     <path style="fill:#7fdcf7;fill-opacity:1;stroke:none"
-          d="m 153.45833,371.08333 v -476.25 L 254,270.54167 Z" />
+          d="M 130,180 v -180 l 38,142 Z" />
+    <path style="fill:#00bbf1;fill-opacity:1;stroke:none"
+          d="M 0,180 h 112 l -32,-32 Z" />
     <path style="fill:#7fdcf7;fill-opacity:1;stroke:none"
-          d="M 201.08333,371.08333 H 402.16667 L 285.75,286.41667 Z" />
+          d="M 148,180 h 76 l -44,-32 Z" />
     <path style="fill:#7fdcf7;fill-opacity:1;stroke:none"
-          d="m 277.8125,262.60417 -18.52083,-68.79167 190.5,-76.72917 L 325.4375,297 Z" />
+          d="M 177,139 l -7,-26 l 72,-29 l -47,68 Z" />
   </g>
 </svg>