diff --git a/Makefile b/Makefile
index ef263bb0ceaa..5f79a6024671 100644
--- a/Makefile
+++ b/Makefile
@@ -110,6 +110,7 @@ else
 	@echo
 endif
 endif
+	$(Q) $(MAKE) -C dotnet shutdown-build-server
 
 .PHONY: package release
 package release:
diff --git a/dotnet/Makefile b/dotnet/Makefile
index 24c2192d4db2..a11033872d0d 100644
--- a/dotnet/Makefile
+++ b/dotnet/Makefile
@@ -546,4 +546,9 @@ all-hook::
 	$(Q) $(MAKE) shutdown-build-server
 
 shutdown-build-server:
-	$(Q) $(DOTNET) build-server shutdown
+	$(Q) echo "Shutting down build servers:"
+	$(Q) $(DOTNET) build-server shutdown | sed 's/^/    /' || true
+	$(Q) echo "Listing .NET processes still alive:"
+	$(Q) pgrep -lf "^$(DOTNET)" | sed 's/^/    /' || true
+	$(Q) echo "Killing the above mentioned processes."
+	$(Q) pkill -9 -f "^$(DOTNET)" | sed 's/^/    /' || true