diff --git a/MAINTAINERS b/MAINTAINERS
index 3bb039b4..77c5fa7b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9,10 +9,12 @@
 # This file is compiled into the MAINTAINERS file in docker/opensource.
 #
 [Org]
-	[Org."Core maintainers"]
-		people = [
-			"crosbymichael",
-		]
+    [Org."Core maintainers"]
+        people = [
+            "crosbymichael",
+            "tonistiigi",
+            "mlaventure",
+        ]
 
 [people]
 
@@ -22,7 +24,18 @@
 
 	# ADD YOURSELF HERE IN ALPHABETICAL ORDER
 
-	[people.crosbymichael]
-	Name = "Michael Crosby"
-	Email = "crosbymichael@gmail.com"
-	GitHub = "crosbymichael"
+    [people.crosbymichael]
+    Name = "Michael Crosby"
+    Email = "crosbymichael@gmail.com"
+    GitHub = "crosbymichael"
+
+    [people.tonistiigi]
+    Name = "Tõnis Tiigi"
+    Email = "tonis@docker.com"
+    GitHub = "tonistiigi"
+
+    [people.mlaventure]
+    Name = "Kenfe-Mickaël Laventure"
+    Email = "mickael.laventure@docker.com"
+    GitHub = "mlaventure"
+
diff --git a/containerd/main.go b/containerd/main.go
index 74f70489..1c9ec145 100644
--- a/containerd/main.go
+++ b/containerd/main.go
@@ -112,6 +112,7 @@ func daemon(address, stateDir string, concurrency int, runtimeName string) error
 				logrus.WithField("error", err).Warn("containerd: reap child processes")
 			}
 		default:
+			logrus.Infof("stopping containerd after receiving %s", ss)
 			server.Stop()
 			os.Exit(0)
 		}