diff --git a/Apps/Sandcastle/gallery/CZML Polyline.html b/Apps/Sandcastle/gallery/CZML Polyline.html
index ae6df7cca99f..dd8c02bea00b 100644
--- a/Apps/Sandcastle/gallery/CZML Polyline.html	
+++ b/Apps/Sandcastle/gallery/CZML Polyline.html	
@@ -1,20 +1,20 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
-  <meta name="description" content="CZML Polyline">
-  <meta name="cesium-sandcastle-labels" content="CZML">
-  <title>Cesium Demo</title>
-  <script type="text/javascript" src="../Sandcastle-header.js"></script>
-  <script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
-  <script type="text/javascript">
-  require.config({
-    baseUrl : '../../../Source',
-    waitSeconds : 60
-  });
-  </script>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+    <meta name="description" content="CZML Polyline">
+    <meta name="cesium-sandcastle-labels" content="CZML">
+    <title>Cesium Demo</title>
+    <script type="text/javascript" src="../Sandcastle-header.js"></script>
+    <script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
+    <script type="text/javascript">
+    require.config({
+        baseUrl : '../../../Source',
+        waitSeconds : 60
+    });
+    </script>
 </head>
 <body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
 <style>
@@ -26,8 +26,8 @@
 
 <script id="cesium_sandcastle_script">
 function startup(Cesium) {
-  'use strict';
-  //Sandcastle_Begin
+    'use strict';
+//Sandcastle_Begin
 var czml = [
   {
     "id" : "document",
@@ -101,7 +101,7 @@
   },
   {
     "id" : "purpleLine",
-    "name" : "Purple straight line at height",
+    "name" : "Purple arrow at height",
     "polyline" : {
       "positions" : {
         "cartographicDegrees" : [
@@ -110,7 +110,7 @@
         ]
       },
       "material" : {
-        "solidColor" : {
+        "polylineArrow" : {
           "color" : {
             "rgba" : [148, 0, 211, 255]
           }
@@ -128,12 +128,12 @@
 viewer.zoomTo(dataSource);
 
   //Sandcastle_End
-  Sandcastle.finishedLoading();
+    Sandcastle.finishedLoading();
 }
 if (typeof Cesium !== "undefined") {
-  startup(Cesium);
+    startup(Cesium);
 } else if (typeof require === "function") {
-  require(["Cesium"], startup);
+    require(["Cesium"], startup);
 }
 </script>
 </body>
diff --git a/CHANGES.md b/CHANGES.md
index 5b0aa11c0bec..f829e01acbad 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ Change Log
 * Fixed issue causing the fog to go dark and the atmosphere to flicker when the camera clips the globe. [#3178](https://github.com/AnalyticalGraphicsInc/cesium/issues/3178)
 * Fixed a bug that caused an exception and rendering to stop when using `ArcGisMapServerImageryProvider` to connect to a MapServer specifying the Web Mercator projection and a fullExtent bigger than the valid extent of the projection. [#3854](https://github.com/AnalyticalGraphicsInc/cesium/pull/3854)
 * Fixed issue causing an exception when switching scene modes with an active KML network link. [#3865](https://github.com/AnalyticalGraphicsInc/cesium/issues/3865)
+* Added support for polyline arrow material to `CzmlDataSource` [#3860](https://github.com/AnalyticalGraphicsInc/cesium/pull/3860)
 
 ### 1.20 - 2016-04-01
 
diff --git a/Source/DataSources/CzmlDataSource.js b/Source/DataSources/CzmlDataSource.js
index 8ee31cf7c84e..7cbbd159573c 100644
--- a/Source/DataSources/CzmlDataSource.js
+++ b/Source/DataSources/CzmlDataSource.js
@@ -56,6 +56,7 @@ define([
         './PathGraphics',
         './PointGraphics',
         './PolygonGraphics',
+        './PolylineArrowMaterialProperty',
         './PolylineGlowMaterialProperty',
         './PolylineGraphics',
         './PolylineOutlineMaterialProperty',
@@ -128,6 +129,7 @@ define([
         PathGraphics,
         PointGraphics,
         PolygonGraphics,
+        PolylineArrowMaterialProperty,
         PolylineGlowMaterialProperty,
         PolylineGraphics,
         PolylineOutlineMaterialProperty,
@@ -829,6 +831,12 @@ define([
             materialData = packetData.polylineGlow;
             processPacketData(Color, existingMaterial, 'color', materialData.color, undefined, sourceUri, entityCollection);
             processPacketData(Number, existingMaterial, 'glowPower', materialData.glowPower, undefined, sourceUri, entityCollection);
+        } else if (defined(packetData.polylineArrow)) {
+            if (!(existingMaterial instanceof PolylineArrowMaterialProperty)) {
+                existingMaterial = new PolylineArrowMaterialProperty();
+            }
+            materialData = packetData.polylineArrow;
+            processPacketData(Color, existingMaterial, 'color', materialData.color, undefined, undefined, entityCollection);
         }
 
         if (defined(existingInterval)) {
diff --git a/Specs/DataSources/CzmlDataSourceSpec.js b/Specs/DataSources/CzmlDataSourceSpec.js
index 60181de7c087..6cf5f5f78ac5 100644
--- a/Specs/DataSources/CzmlDataSourceSpec.js
+++ b/Specs/DataSources/CzmlDataSourceSpec.js
@@ -2157,6 +2157,27 @@ defineSuite([
         expect(entity.polyline.material.glowPower.getValue()).toEqual(0.75);
     });
 
+    it('Polyline arrow.', function() {
+        var packet = {
+            id : 'polylineArrow',
+            polyline : {
+                material : {
+                    polylineArrow : {
+                        color : {
+                            rgbaf : [0.1, 0.2, 0.3, 0.4]
+                        }
+                    }
+                }
+            }
+        };
+
+        var dataSource = new CzmlDataSource();
+        dataSource.load(makePacket(packet));
+
+        var entity = dataSource.entities.getById('polylineArrow');
+        expect(entity.polyline.material.color.getValue()).toEqual(new Color(0.1, 0.2, 0.3, 0.4));
+    });
+
     it('Processes extrapolation options', function() {
         var packet = {
             id : 'point',
