diff --git a/api/services/events/v1/container.pb.go b/api/services/events/v1/container.pb.go
index 2533b1d43..420aba036 100644
--- a/api/services/events/v1/container.pb.go
+++ b/api/services/events/v1/container.pb.go
@@ -53,7 +53,7 @@ import _ "github.com/gogo/protobuf/gogoproto"
 import google_protobuf1 "github.com/gogo/protobuf/types"
 import _ "github.com/containerd/containerd/protobuf/plugin"
 
-import github_com_containerd_containerd_typeurl "github.com/containerd/containerd/typeurl"
+import github_com_containerd_typeurl "github.com/containerd/typeurl"
 
 import strings "strings"
 import reflect "reflect"
@@ -158,7 +158,7 @@ func (m *ContainerCreate_Runtime) Field(fieldpath []string) (string, bool) {
 	case "name":
 		return string(m.Name), len(m.Name) > 0
 	case "options":
-		decoded, err := github_com_containerd_containerd_typeurl.UnmarshalAny(m.Options)
+		decoded, err := github_com_containerd_typeurl.UnmarshalAny(m.Options)
 		if err != nil {
 			return "", false
 		}
diff --git a/api/services/events/v1/events.pb.go b/api/services/events/v1/events.pb.go
index 1d068d07b..e89406440 100644
--- a/api/services/events/v1/events.pb.go
+++ b/api/services/events/v1/events.pb.go
@@ -15,7 +15,7 @@ import _ "github.com/gogo/protobuf/types"
 
 import time "time"
 
-import github_com_containerd_containerd_typeurl "github.com/containerd/containerd/typeurl"
+import github_com_containerd_typeurl "github.com/containerd/typeurl"
 
 import (
 	context "golang.org/x/net/context"
@@ -92,7 +92,7 @@ func (m *Envelope) Field(fieldpath []string) (string, bool) {
 	case "topic":
 		return string(m.Topic), len(m.Topic) > 0
 	case "event":
-		decoded, err := github_com_containerd_containerd_typeurl.UnmarshalAny(m.Event)
+		decoded, err := github_com_containerd_typeurl.UnmarshalAny(m.Event)
 		if err != nil {
 			return "", false
 		}
diff --git a/client.go b/client.go
index ddf66bc8f..2c7227241 100644
--- a/client.go
+++ b/client.go
@@ -34,7 +34,7 @@ import (
 	imagesservice "github.com/containerd/containerd/services/images"
 	snapshotservice "github.com/containerd/containerd/services/snapshot"
 	"github.com/containerd/containerd/snapshot"
-	"github.com/containerd/containerd/typeurl"
+	"github.com/containerd/typeurl"
 	pempty "github.com/golang/protobuf/ptypes/empty"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
@@ -44,12 +44,13 @@ import (
 )
 
 func init() {
+	const prefix = "types.containerd.io"
 	// register TypeUrls for commonly marshaled external types
 	major := strconv.Itoa(specs.VersionMajor)
-	typeurl.Register(&specs.Spec{}, "opencontainers/runtime-spec", major, "Spec")
-	typeurl.Register(&specs.Process{}, "opencontainers/runtime-spec", major, "Process")
-	typeurl.Register(&specs.LinuxResources{}, "opencontainers/runtime-spec", major, "LinuxResources")
-	typeurl.Register(&specs.WindowsResources{}, "opencontainers/runtime-spec", major, "WindowsResources")
+	typeurl.Register(&specs.Spec{}, prefix, "opencontainers/runtime-spec", major, "Spec")
+	typeurl.Register(&specs.Process{}, prefix, "opencontainers/runtime-spec", major, "Process")
+	typeurl.Register(&specs.LinuxResources{}, prefix, "opencontainers/runtime-spec", major, "LinuxResources")
+	typeurl.Register(&specs.WindowsResources{}, prefix, "opencontainers/runtime-spec", major, "WindowsResources")
 }
 
 // New returns a new containerd client that is connected to the containerd
diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go
index 8e449bf20..697f0c0b3 100644
--- a/cmd/containerd-shim/main_unix.go
+++ b/cmd/containerd-shim/main_unix.go
@@ -20,8 +20,8 @@ import (
 	"github.com/containerd/containerd/linux/shim"
 	shimapi "github.com/containerd/containerd/linux/shim/v1"
 	"github.com/containerd/containerd/reaper"
-	"github.com/containerd/containerd/typeurl"
 	"github.com/containerd/containerd/version"
+	"github.com/containerd/typeurl"
 	google_protobuf "github.com/golang/protobuf/ptypes/empty"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/cmd/ctr/events.go b/cmd/ctr/events.go
index df4e54a7e..e648bf0fa 100644
--- a/cmd/ctr/events.go
+++ b/cmd/ctr/events.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	eventsapi "github.com/containerd/containerd/api/services/events/v1"
-	"github.com/containerd/containerd/typeurl"
+	"github.com/containerd/typeurl"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/ctr/shim.go b/cmd/ctr/shim.go
index c5625f35a..2973c00e6 100644
--- a/cmd/ctr/shim.go
+++ b/cmd/ctr/shim.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/containerd/console"
 	shim "github.com/containerd/containerd/linux/shim/v1"
-	"github.com/containerd/containerd/typeurl"
+	"github.com/containerd/typeurl"
 	protobuf "github.com/gogo/protobuf/types"
 	google_protobuf "github.com/golang/protobuf/ptypes/empty"
 	"github.com/opencontainers/runtime-spec/specs-go"
diff --git a/container.go b/container.go
index af42cd44c..eec8863a6 100644
--- a/container.go
+++ b/container.go
@@ -11,7 +11,7 @@ import (
 	"github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/errdefs"
-	"github.com/containerd/containerd/typeurl"
+	"github.com/containerd/typeurl"
 	prototypes "github.com/gogo/protobuf/types"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
diff --git a/container_opts.go b/container_opts.go
index 756de7ad3..1f836e55f 100644
--- a/container_opts.go
+++ b/container_opts.go
@@ -6,7 +6,7 @@ import (
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/platforms"
-	"github.com/containerd/containerd/typeurl"
+	"github.com/containerd/typeurl"
 	"github.com/gogo/protobuf/types"
 	"github.com/opencontainers/image-spec/identity"
 	"github.com/pkg/errors"
diff --git a/events/exchange.go b/events/exchange.go
index 93f6dfa91..0c8e60f0e 100644
--- a/events/exchange.go
+++ b/events/exchange.go
@@ -11,7 +11,7 @@ import (
 	"github.com/containerd/containerd/identifiers"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/namespaces"
-	"github.com/containerd/containerd/typeurl"
+	"github.com/containerd/typeurl"
 	goevents "github.com/docker/go-events"
 	"github.com/gogo/protobuf/types"
 	"github.com/pkg/errors"
diff --git a/events/exchange_test.go b/events/exchange_test.go
index 38f059c67..5493fa305 100644
--- a/events/exchange_test.go
+++ b/events/exchange_test.go
@@ -11,7 +11,7 @@ import (
 	events "github.com/containerd/containerd/api/services/events/v1"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/namespaces"
-	"github.com/containerd/containerd/typeurl"
+	"github.com/containerd/typeurl"
 	"github.com/pkg/errors"
 )
 
diff --git a/linux/runtime.go b/linux/runtime.go
index 93938fab2..3bb90916f 100644
--- a/linux/runtime.go
+++ b/linux/runtime.go
@@ -27,8 +27,8 @@ import (
 	"github.com/containerd/containerd/reaper"
 	"github.com/containerd/containerd/runtime"
 	"github.com/containerd/containerd/sys"
-	"github.com/containerd/containerd/typeurl"
 	runc "github.com/containerd/go-runc"
+	"github.com/containerd/typeurl"
 	google_protobuf "github.com/golang/protobuf/ptypes/empty"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/linux/shim/init.go b/linux/shim/init.go
index 19a76bbbf..6baf7e72c 100644
--- a/linux/shim/init.go
+++ b/linux/shim/init.go
@@ -20,9 +20,9 @@ import (
 	shimapi "github.com/containerd/containerd/linux/shim/v1"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
-	"github.com/containerd/containerd/typeurl"
 	"github.com/containerd/fifo"
 	runc "github.com/containerd/go-runc"
+	"github.com/containerd/typeurl"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
 )
diff --git a/metadata/containers_test.go b/metadata/containers_test.go
index 35411d5c8..781dc861c 100644
--- a/metadata/containers_test.go
+++ b/metadata/containers_test.go
@@ -15,14 +15,14 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/filters"
 	"github.com/containerd/containerd/namespaces"
-	"github.com/containerd/containerd/typeurl"
+	"github.com/containerd/typeurl"
 	"github.com/gogo/protobuf/types"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
 )
 
 func init() {
-	typeurl.Register(&specs.Spec{}, "opencontainers/runtime-spec", "v1", "Spec")
+	typeurl.Register(&specs.Spec{}, "types.contianerd.io/opencontainers/runtime-spec", "v1", "Spec")
 }
 
 func TestContainersList(t *testing.T) {
diff --git a/process.go b/process.go
index 536d8a85e..b3e03c279 100644
--- a/process.go
+++ b/process.go
@@ -10,7 +10,7 @@ import (
 	"github.com/containerd/containerd/api/services/tasks/v1"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/runtime"
-	"github.com/containerd/containerd/typeurl"
+	"github.com/containerd/typeurl"
 	"github.com/pkg/errors"
 )
 
diff --git a/protobuf/plugin/fieldpath/fieldpath.go b/protobuf/plugin/fieldpath/fieldpath.go
index 90fb84766..2eb929afd 100644
--- a/protobuf/plugin/fieldpath/fieldpath.go
+++ b/protobuf/plugin/fieldpath/fieldpath.go
@@ -29,7 +29,7 @@ func (p *fieldpathGenerator) Init(g *generator.Generator) {
 
 func (p *fieldpathGenerator) Generate(file *generator.FileDescriptor) {
 	p.PluginImports = generator.NewPluginImports(p.Generator)
-	p.typeurlPkg = p.NewImport("github.com/containerd/containerd/typeurl")
+	p.typeurlPkg = p.NewImport("github.com/containerd/typeurl")
 
 	for _, m := range file.Messages() {
 		if m.DescriptorProto.GetOptions().GetMapEntry() {
diff --git a/runtime/typeurl.go b/runtime/typeurl.go
index 46b186d28..8ba2b43a6 100644
--- a/runtime/typeurl.go
+++ b/runtime/typeurl.go
@@ -3,15 +3,16 @@ package runtime
 import (
 	"strconv"
 
-	"github.com/containerd/containerd/typeurl"
+	"github.com/containerd/typeurl"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 
 func init() {
+	const prefix = "types.containerd.io"
 	// register TypeUrls for commonly marshaled external types
 	major := strconv.Itoa(specs.VersionMajor)
-	typeurl.Register(&specs.Spec{}, "opencontainers/runtime-spec", major, "Spec")
-	typeurl.Register(&specs.Process{}, "opencontainers/runtime-spec", major, "Process")
-	typeurl.Register(&specs.LinuxResources{}, "opencontainers/runtime-spec", major, "LinuxResources")
-	typeurl.Register(&specs.WindowsResources{}, "opencontainers/runtime-spec", major, "WindowsResources")
+	typeurl.Register(&specs.Spec{}, prefix, "opencontainers/runtime-spec", major, "Spec")
+	typeurl.Register(&specs.Process{}, prefix, "opencontainers/runtime-spec", major, "Process")
+	typeurl.Register(&specs.LinuxResources{}, prefix, "opencontainers/runtime-spec", major, "LinuxResources")
+	typeurl.Register(&specs.WindowsResources{}, prefix, "opencontainers/runtime-spec", major, "WindowsResources")
 }
diff --git a/services/tasks/service.go b/services/tasks/service.go
index 62dd90d1d..6b0f065be 100644
--- a/services/tasks/service.go
+++ b/services/tasks/service.go
@@ -25,7 +25,7 @@ import (
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/runtime"
-	"github.com/containerd/containerd/typeurl"
+	"github.com/containerd/typeurl"
 	google_protobuf "github.com/golang/protobuf/ptypes/empty"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
diff --git a/spec_opts.go b/spec_opts.go
index 811e1eeba..40cd2fa3f 100644
--- a/spec_opts.go
+++ b/spec_opts.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/containerd/containerd/containers"
-	"github.com/containerd/containerd/typeurl"
+	"github.com/containerd/typeurl"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 
diff --git a/task.go b/task.go
index 6da88d374..90ccbd14a 100644
--- a/task.go
+++ b/task.go
@@ -21,7 +21,7 @@ import (
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/rootfs"
 	"github.com/containerd/containerd/runtime"
-	"github.com/containerd/containerd/typeurl"
+	"github.com/containerd/typeurl"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/opencontainers/image-spec/specs-go/v1"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
diff --git a/typeurl/marshal_test.go b/typeurl/marshal_test.go
deleted file mode 100644
index 9ca5adca6..000000000
--- a/typeurl/marshal_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package typeurl_test
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-
-	eventsapi "github.com/containerd/containerd/api/services/events/v1"
-	"github.com/containerd/containerd/typeurl"
-)
-
-func TestMarshalEvent(t *testing.T) {
-	for _, testcase := range []struct {
-		event interface{}
-		url   string
-	}{
-		{
-			event: &eventsapi.TaskStart{},
-			url:   "types.containerd.io/containerd.services.events.v1.TaskStart",
-		},
-
-		{
-			event: &eventsapi.NamespaceUpdate{},
-			url:   "types.containerd.io/containerd.services.events.v1.NamespaceUpdate",
-		},
-	} {
-		t.Run(fmt.Sprintf("%T", testcase.event), func(t *testing.T) {
-			a, err := typeurl.MarshalAny(testcase.event)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if a.TypeUrl != testcase.url {
-				t.Fatalf("unexpected url: %v != %v", a.TypeUrl, testcase.url)
-			}
-
-			v, err := typeurl.UnmarshalAny(a)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if !reflect.DeepEqual(v, testcase.event) {
-				t.Fatalf("round trip failed %v != %v", v, testcase.event)
-			}
-		})
-	}
-}
-
-func BenchmarkMarshalEvent(b *testing.B) {
-	ev := &eventsapi.TaskStart{}
-	expected, err := typeurl.MarshalAny(ev)
-	if err != nil {
-		b.Fatal(err)
-	}
-	for i := 0; i < b.N; i++ {
-		a, err := typeurl.MarshalAny(ev)
-		if err != nil {
-			b.Fatal(err)
-		}
-		if a.TypeUrl != expected.TypeUrl {
-			b.Fatalf("incorrect type url: %v != %v", a, expected)
-		}
-	}
-}
diff --git a/typeurl/types_test.go b/typeurl/types_test.go
deleted file mode 100644
index c4bc89592..000000000
--- a/typeurl/types_test.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package typeurl
-
-import (
-	"path/filepath"
-	"reflect"
-	"testing"
-)
-
-type test struct {
-	Name string
-	Age  int
-}
-
-func clear() {
-	registry = make(map[reflect.Type]string)
-}
-
-func TestRegisterPointerGetPointer(t *testing.T) {
-	clear()
-	expected := filepath.Join(Prefix, "test")
-	Register(&test{}, "test")
-
-	url, err := TypeURL(&test{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if url != expected {
-		t.Fatalf("expected %q but received %q", expected, url)
-	}
-}
-
-func TestMarshal(t *testing.T) {
-	clear()
-	expected := filepath.Join(Prefix, "test")
-	Register(&test{}, "test")
-
-	v := &test{
-		Name: "koye",
-		Age:  6,
-	}
-	any, err := MarshalAny(v)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if any.TypeUrl != expected {
-		t.Fatalf("expected %q but received %q", expected, any.TypeUrl)
-	}
-
-	// marshal it again and make sure we get the same thing back.
-	newany, err := MarshalAny(any)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if newany != any { // you that right: we want the same *pointer*!
-		t.Fatalf("expected to get back same object: %v != %v", newany, any)
-	}
-
-}
-
-func TestMarshalUnmarshal(t *testing.T) {
-	clear()
-	Register(&test{}, "test")
-
-	v := &test{
-		Name: "koye",
-		Age:  6,
-	}
-	any, err := MarshalAny(v)
-	if err != nil {
-		t.Fatal(err)
-	}
-	nv, err := UnmarshalAny(any)
-	if err != nil {
-		t.Fatal(err)
-	}
-	td, ok := nv.(*test)
-	if !ok {
-		t.Fatal("expected value to cast to *test")
-	}
-	if td.Name != "koye" {
-		t.Fatal("invalid name")
-	}
-	if td.Age != 6 {
-		t.Fatal("invalid age")
-	}
-}
-
-func TestIs(t *testing.T) {
-	clear()
-	Register(&test{}, "test")
-
-	v := &test{
-		Name: "koye",
-		Age:  6,
-	}
-	any, err := MarshalAny(v)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !Is(any, &test{}) {
-		t.Fatal("Is(any, test{}) should be true")
-	}
-}
-
-func TestRegisterDiffUrls(t *testing.T) {
-	clear()
-	defer func() {
-		if err := recover(); err == nil {
-			t.Error("registering the same type with different urls should panic")
-		}
-	}()
-	Register(&test{}, "test")
-	Register(&test{}, "test", "two")
-}
diff --git a/vendor.conf b/vendor.conf
index 1698fbe70..b501b0b47 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -2,6 +2,7 @@ github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6
 github.com/containerd/go-runc b3c048c028ddd789c6f9510c597f8b9c62f25359
 github.com/containerd/console 76d18fd1d66972718ab2284449591db0b3cdb4de
 github.com/containerd/cgroups 5933ab4dc4f7caa3a73a1dc141bd11f42b5c9163
+github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788
 github.com/docker/go-metrics 8fd5772bf1584597834c6f7961a530f06cbfbb87
 github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
 github.com/godbus/dbus c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f
diff --git a/vendor/github.com/containerd/typeurl/LICENSE b/vendor/github.com/containerd/typeurl/LICENSE
new file mode 100644
index 000000000..261eeb9e9
--- /dev/null
+++ b/vendor/github.com/containerd/typeurl/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/vendor/github.com/containerd/typeurl/README.md b/vendor/github.com/containerd/typeurl/README.md
new file mode 100644
index 000000000..e0787743c
--- /dev/null
+++ b/vendor/github.com/containerd/typeurl/README.md
@@ -0,0 +1,9 @@
+# typeurl
+
+[![Build Status](https://travis-ci.org/containerd/typeurl.svg?branch=master)](https://travis-ci.org/containerd/typeurl)
+
+[![codecov](https://codecov.io/gh/containerd/typeurl/branch/master/graph/badge.svg)](https://codecov.io/gh/containerd/typeurl)
+
+A Go package for managing the registration, marshaling, and unmarshaling of encoded types.
+
+This package helps when types are sent over a GRPC API and marshaled as a [protobuf.Any]().
diff --git a/typeurl/types.go b/vendor/github.com/containerd/typeurl/types.go
similarity index 86%
rename from typeurl/types.go
rename to vendor/github.com/containerd/typeurl/types.go
index 63b214b5e..10a78228b 100644
--- a/typeurl/types.go
+++ b/vendor/github.com/containerd/typeurl/types.go
@@ -4,27 +4,25 @@ import (
 	"encoding/json"
 	"path"
 	"reflect"
-	"strings"
 	"sync"
 
-	"github.com/containerd/containerd/errdefs"
 	"github.com/gogo/protobuf/proto"
 	"github.com/gogo/protobuf/types"
 	"github.com/pkg/errors"
 )
 
-const Prefix = "types.containerd.io"
-
 var (
 	mu       sync.Mutex
 	registry = make(map[reflect.Type]string)
 )
 
+var ErrNotFound = errors.New("not found")
+
 // Register a type with the base url of the type
 func Register(v interface{}, args ...string) {
 	var (
 		t = tryDereference(v)
-		p = path.Join(append([]string{Prefix}, args...)...)
+		p = path.Join(args...)
 	)
 	mu.Lock()
 	defer mu.Unlock()
@@ -46,9 +44,9 @@ func TypeURL(v interface{}) (string, error) {
 		// fallback to the proto registry if it is a proto message
 		pb, ok := v.(proto.Message)
 		if !ok {
-			return "", errors.Wrapf(errdefs.ErrNotFound, "type %s", reflect.TypeOf(v))
+			return "", errors.Wrapf(ErrNotFound, "type %s", reflect.TypeOf(v))
 		}
-		return path.Join(Prefix, proto.MessageName(pb)), nil
+		return proto.MessageName(pb), nil
 	}
 	return u, nil
 }
@@ -123,7 +121,7 @@ func getTypeByUrl(url string) (urlType, error) {
 		}
 	}
 	// fallback to proto registry
-	t := proto.MessageType(strings.TrimPrefix(url, Prefix+"/"))
+	t := proto.MessageType(url)
 	if t != nil {
 		return urlType{
 			// get the underlying Elem because proto returns a pointer to the type
@@ -131,7 +129,7 @@ func getTypeByUrl(url string) (urlType, error) {
 			isProto: true,
 		}, nil
 	}
-	return urlType{}, errors.Wrapf(errdefs.ErrNotFound, "type with url %s", url)
+	return urlType{}, errors.Wrapf(ErrNotFound, "type with url %s", url)
 }
 
 func tryDereference(v interface{}) reflect.Type {
diff --git a/windows/runtime.go b/windows/runtime.go
index 74f499e28..7fd5f524e 100644
--- a/windows/runtime.go
+++ b/windows/runtime.go
@@ -19,8 +19,8 @@ import (
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/runtime"
-	"github.com/containerd/containerd/typeurl"
 	"github.com/containerd/containerd/windows/hcsshimopts"
+	"github.com/containerd/typeurl"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/windows/task.go b/windows/task.go
index 2fa85eb0a..4740a3b39 100644
--- a/windows/task.go
+++ b/windows/task.go
@@ -12,7 +12,7 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/events"
 	"github.com/containerd/containerd/runtime"
-	"github.com/containerd/containerd/typeurl"
+	"github.com/containerd/typeurl"
 	"github.com/gogo/protobuf/types"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"