diff --git a/0002-Remove-windows-only-dep.patch b/0002-Remove-windows-only-dep.patch
new file mode 100644
index 0000000..2ad5f75
--- /dev/null
+++ b/0002-Remove-windows-only-dep.patch
@@ -0,0 +1,22 @@
+--- containerd-1.5.0-beta.0/pkg/cri/server/helpers.go.orig	2021-01-28 00:43:35.024388665 +0100
++++ containerd-1.5.0-beta.0/pkg/cri/server/helpers.go	2021-01-28 00:43:50.906156439 +0100
+@@ -24,7 +24,7 @@
+ 	"strings"
+ 
+ 	"github.com/BurntSushi/toml"
+-	runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
++//	runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
+ 	"github.com/containerd/containerd"
+ 	"github.com/containerd/containerd/containers"
+ 	"github.com/containerd/containerd/plugin"
+@@ -325,8 +325,8 @@
+ 		return &runcoptions.Options{}
+ 	case plugin.RuntimeLinuxV1:
+ 		return &runctypes.RuncOptions{}
+-	case runtimeRunhcsV1:
+-		return &runhcsoptions.Options{}
++//	case runtimeRunhcsV1:
++//		return &runhcsoptions.Options{}
+ 	default:
+ 		return &runtimeoptions.Options{}
+ 	}
diff --git a/containerd.spec b/containerd.spec
index 6bd45c7..8798415 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -7,8 +7,8 @@
 
 # https://github.com/containerd/containerd
 %global goipath         github.com/containerd/containerd
-Version:                1.4.3
-%global tag             v%{version}
+Version:                1.5.0~beta.0
+%global tag             v1.5.0-beta.0
 
 %gometa
 
@@ -23,11 +23,11 @@ system: image transfer and storage, container execution and supervision,
 low-level storage and network attachments, etc.}
 
 %global golicenses      LICENSE NOTICE
-%global godocs          docs PLUGINS.md ROADMAP.md RUNC.md SCOPE.md code-of-\\\
+%global godocs          docs ROADMAP.md RUNC.md SCOPE.md code-of-\\\
                         conduct.md BUILDING.md README.md RELEASES.md
 
 Name:           %{goname}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Open and reliable container runtime
 
 # Upstream license specification: Apache-2.0
@@ -38,13 +38,14 @@ Source1:        containerd.service
 Source2:        containerd.toml
 # Carve out code requiring github.com/Microsoft/hcsshim
 Patch0:         0001-Revert-commit-for-Windows-metrics.patch
+Patch1:         0002-Remove-windows-only-dep.patch
 
 BuildRequires:  btrfs-progs-devel
 BuildRequires:  go-md2man
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  golang(github.com/BurntSushi/toml)
 %if %{without bootstrap}
-BuildRequires:  golang(github.com/containerd/aufs)
+BuildRequires:  golang(github.com/containerd/aufs/plugin)
 %endif
 BuildRequires:  golang(github.com/containerd/btrfs)
 BuildRequires:  golang(github.com/containerd/cgroups)
@@ -52,24 +53,31 @@ BuildRequires:  golang(github.com/containerd/cgroups/stats/v1)
 BuildRequires:  golang(github.com/containerd/cgroups/v2)
 BuildRequires:  golang(github.com/containerd/cgroups/v2/stats)
 BuildRequires:  golang(github.com/containerd/console)
+BuildRequires:  golang(github.com/containerd/continuity)
 BuildRequires:  golang(github.com/containerd/continuity/fs)
 BuildRequires:  golang(github.com/containerd/continuity/fs/fstest)
 BuildRequires:  golang(github.com/containerd/continuity/sysx)
-%if %{without bootstrap}
-BuildRequires:  golang(github.com/containerd/cri)
-%endif
 BuildRequires:  golang(github.com/containerd/fifo)
+BuildRequires:  golang(github.com/containerd/go-cni)
 BuildRequires:  golang(github.com/containerd/go-runc)
+BuildRequires:  golang(github.com/containerd/imgcrypt)
+BuildRequires:  golang(github.com/containerd/imgcrypt/images/encryption)
+BuildRequires:  golang(github.com/containerd/nri)
+BuildRequires:  golang(github.com/containerd/nri/types/v1)
 BuildRequires:  golang(github.com/containerd/ttrpc)
 BuildRequires:  golang(github.com/containerd/ttrpc/plugin)
 BuildRequires:  golang(github.com/containerd/typeurl)
 %if %{without bootstrap}
-BuildRequires:  golang(github.com/containerd/zfs)
+BuildRequires:  golang(github.com/containerd/zfs/plugin)
 %endif
+BuildRequires:  golang(github.com/containernetworking/plugins/pkg/ns)
 BuildRequires:  golang(github.com/coreos/go-systemd/v22/daemon)
+BuildRequires:  golang(github.com/davecgh/go-spew/spew)
 BuildRequires:  golang(github.com/docker/go-events)
 BuildRequires:  golang(github.com/docker/go-metrics)
 BuildRequires:  golang(github.com/docker/go-units)
+BuildRequires:  golang(github.com/emicklei/go-restful)
+BuildRequires:  golang(github.com/fsnotify/fsnotify)
 BuildRequires:  golang(github.com/gogo/googleapis/google/rpc)
 BuildRequires:  golang(github.com/gogo/protobuf/gogoproto)
 BuildRequires:  golang(github.com/gogo/protobuf/proto)
@@ -83,20 +91,29 @@ BuildRequires:  golang(github.com/google/uuid)
 BuildRequires:  golang(github.com/grpc-ecosystem/go-grpc-prometheus)
 BuildRequires:  golang(github.com/hashicorp/go-multierror)
 BuildRequires:  golang(github.com/imdario/mergo)
+BuildRequires:  golang(github.com/klauspost/compress/zstd)
+# BuildRequires:  golang(github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options)
 # BuildRequires:  golang(github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats)
+BuildRequires:  golang(github.com/moby/sys/mountinfo)
+BuildRequires:  golang(github.com/moby/sys/symlink)
 BuildRequires:  golang(github.com/opencontainers/go-digest)
+BuildRequires:  golang(github.com/opencontainers/go-digest/digestset)
 BuildRequires:  golang(github.com/opencontainers/image-spec/identity)
 BuildRequires:  golang(github.com/opencontainers/image-spec/specs-go)
 BuildRequires:  golang(github.com/opencontainers/image-spec/specs-go/v1)
+BuildRequires:  golang(github.com/opencontainers/runc/libcontainer/devices)
 BuildRequires:  golang(github.com/opencontainers/runc/libcontainer/user)
 BuildRequires:  golang(github.com/opencontainers/runtime-spec/specs-go)
+BuildRequires:  golang(github.com/opencontainers/selinux/go-selinux)
 BuildRequires:  golang(github.com/opencontainers/selinux/go-selinux/label)
 BuildRequires:  golang(github.com/pkg/errors)
 BuildRequires:  golang(github.com/prometheus/client_golang/prometheus)
 BuildRequires:  golang(github.com/sirupsen/logrus)
 BuildRequires:  golang(github.com/syndtr/gocapability/capability)
+BuildRequires:  golang(github.com/tchap/go-patricia/patricia)
 BuildRequires:  golang(github.com/urfave/cli)
 BuildRequires:  golang(go.etcd.io/bbolt)
+BuildRequires:  golang(golang.org/x/net/context)
 BuildRequires:  golang(golang.org/x/net/context/ctxhttp)
 BuildRequires:  golang(golang.org/x/sync/errgroup)
 BuildRequires:  golang(golang.org/x/sync/semaphore)
@@ -112,13 +129,38 @@ BuildRequires:  golang(google.golang.org/grpc/metadata)
 BuildRequires:  golang(google.golang.org/grpc/status)
 BuildRequires:  golang(gotest.tools/v3/assert)
 BuildRequires:  golang(gotest.tools/v3/assert/cmp)
+BuildRequires:  golang(k8s.io/api/core/v1)
+BuildRequires:  golang(k8s.io/apimachinery/pkg/api/errors)
+BuildRequires:  golang(k8s.io/apimachinery/pkg/api/resource)
+BuildRequires:  golang(k8s.io/apimachinery/pkg/apis/meta/v1)
+BuildRequires:  golang(k8s.io/apimachinery/pkg/types)
+BuildRequires:  golang(k8s.io/apimachinery/pkg/util/clock)
+BuildRequires:  golang(k8s.io/apimachinery/pkg/util/httpstream)
+BuildRequires:  golang(k8s.io/apimachinery/pkg/util/httpstream/spdy)
+BuildRequires:  golang(k8s.io/apimachinery/pkg/util/net)
+BuildRequires:  golang(k8s.io/apimachinery/pkg/util/remotecommand)
+BuildRequires:  golang(k8s.io/apimachinery/pkg/util/runtime)
+BuildRequires:  golang(k8s.io/apimachinery/pkg/util/sets)
+BuildRequires:  golang(k8s.io/apiserver/pkg/server/httplog)
+BuildRequires:  golang(k8s.io/apiserver/pkg/util/wsstream)
+BuildRequires:  golang(k8s.io/client-go/tools/remotecommand)
+BuildRequires:  golang(k8s.io/client-go/util/cert)
+BuildRequires:  golang(k8s.io/component-base/logs/logreduction)
+BuildRequires:  golang(k8s.io/cri-api/pkg/apis)
+BuildRequires:  golang(k8s.io/cri-api/pkg/apis/runtime/v1alpha2)
+BuildRequires:  golang(k8s.io/klog/v2)
+BuildRequires:  golang(k8s.io/utils/exec)
 
 %if %{with check}
 # Tests
 BuildRequires:  golang(github.com/containerd/continuity/testutil)
 BuildRequires:  golang(github.com/containerd/continuity/testutil/loopback)
+BuildRequires:  golang(github.com/golang/protobuf/proto)
 BuildRequires:  golang(github.com/google/go-cmp/cmp)
 BuildRequires:  golang(github.com/google/go-cmp/cmp/cmpopts)
+BuildRequires:  golang(github.com/opencontainers/runc/libcontainer/configs)
+BuildRequires:  golang(github.com/stretchr/testify/assert)
+BuildRequires:  golang(github.com/stretchr/testify/require)
 %endif
 
 Requires:       runc
@@ -130,7 +172,7 @@ Requires:       runc
 
 %prep
 %goprep
-%patch0 -p1
+%autopatch -p1
 # Used only for generation:
 rm -rf cmd/protoc-gen-gogoctrd
 
@@ -174,13 +216,13 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml
 
 %if %{with check}
 %check
-%gocheck -d . -d mount -t snapshots
+%gocheck -d . -d mount -t snapshots -d pkg/cri/server
 %endif
 
 %if %{without bootstrap}
 %files
 %license LICENSE NOTICE
-%doc docs PLUGINS.md ROADMAP.md RUNC.md SCOPE.md code-of-conduct.md BUILDING.md
+%doc docs ROADMAP.md RUNC.md SCOPE.md code-of-conduct.md BUILDING.md
 %doc README.md RELEASES.md
 %{_bindir}/*
 %{_mandir}/man8/containerd.8*
@@ -195,6 +237,9 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml
 %gopkgfiles
 
 %changelog
+* Thu Jan 28 2021 Olivier Lemasle <o.lemasle@gmail.com> 1.5.0~beta.0-1
+- Update to 1.5.0~beta.0 (#1918993)
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 745dd52..574d92f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (containerd-1.4.3.tar.gz) = 40501a45c46e4f2f6df1ce9e4142612863b400bb2e804b1e23a0b9f0b1ed3d5c83a6fcce4e70f82a4557ce0f301e2de11cf2935039cb74b8ebec0dc71752406e
+SHA512 (containerd-1.5.0-beta.0.tar.gz) = 3626067adc4c708f5d2aa8b24fb6b8773a99987de220408fbde1e2c3f6fbd1505d15dc51c69326387a6b2e773f6ea6a937fddb70909d4bbf7461a8fb7ca655cb