1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 22f8270a07..fe54bdfd09 100644
--- a/Makefile
+++ b/Makefile
@@ -270,7 +270,11 @@ clear-resource-alarm: all
 	$(ERL_CALL)
 
 stop-node:
-	-$(ERL_CALL) -q
+	-( \
+	pid=$$(./scripts/rabbitmqctl -n $(RABBITMQ_NODENAME) eval 'os:getpid().') && \
+	$(ERL_CALL) -q && \
+	while ps -p $$pid >/dev/null 2>&1; do sleep 1; done \
+	)
 
 # code coverage will be created for subdirectory "ebin" of COVER_DIR
 COVER_DIR=.