diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 731de59231c6..5b92d968ae4b 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION= 	2.0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
diff --git a/mail/cyrus-imapd/files/imapd.sh b/mail/cyrus-imapd/files/imapd.sh
index a08c94fc3ad7..5453fc5ba90e 100644
--- a/mail/cyrus-imapd/files/imapd.sh
+++ b/mail/cyrus-imapd/files/imapd.sh
@@ -10,7 +10,7 @@ start)
 	fi
 	;;
 stop)
-	kill `ps -a | awk '/cyrus\/bin\/master$/ {print $1}'` && \
+	kill `ps -U cyrus | awk '/master/ {print $1}'` && echo -n ' imapd'
 		echo -n ' imapd'
 	;;
 *)
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 731de59231c6..5b92d968ae4b 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION= 	2.0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
diff --git a/mail/cyrus-imapd2/files/imapd.sh b/mail/cyrus-imapd2/files/imapd.sh
index a08c94fc3ad7..5453fc5ba90e 100644
--- a/mail/cyrus-imapd2/files/imapd.sh
+++ b/mail/cyrus-imapd2/files/imapd.sh
@@ -10,7 +10,7 @@ start)
 	fi
 	;;
 stop)
-	kill `ps -a | awk '/cyrus\/bin\/master$/ {print $1}'` && \
+	kill `ps -U cyrus | awk '/master/ {print $1}'` && echo -n ' imapd'
 		echo -n ' imapd'
 	;;
 *)
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 731de59231c6..5b92d968ae4b 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION= 	2.0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
diff --git a/mail/cyrus-imapd22/files/imapd.sh b/mail/cyrus-imapd22/files/imapd.sh
index a08c94fc3ad7..5453fc5ba90e 100644
--- a/mail/cyrus-imapd22/files/imapd.sh
+++ b/mail/cyrus-imapd22/files/imapd.sh
@@ -10,7 +10,7 @@ start)
 	fi
 	;;
 stop)
-	kill `ps -a | awk '/cyrus\/bin\/master$/ {print $1}'` && \
+	kill `ps -U cyrus | awk '/master/ {print $1}'` && echo -n ' imapd'
 		echo -n ' imapd'
 	;;
 *)
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 731de59231c6..5b92d968ae4b 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION= 	2.0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
diff --git a/mail/cyrus-imapd23/files/imapd.sh b/mail/cyrus-imapd23/files/imapd.sh
index a08c94fc3ad7..5453fc5ba90e 100644
--- a/mail/cyrus-imapd23/files/imapd.sh
+++ b/mail/cyrus-imapd23/files/imapd.sh
@@ -10,7 +10,7 @@ start)
 	fi
 	;;
 stop)
-	kill `ps -a | awk '/cyrus\/bin\/master$/ {print $1}'` && \
+	kill `ps -U cyrus | awk '/master/ {print $1}'` && echo -n ' imapd'
 		echo -n ' imapd'
 	;;
 *)
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 731de59231c6..5b92d968ae4b 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION= 	2.0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
diff --git a/mail/cyrus-imapd24/files/imapd.sh b/mail/cyrus-imapd24/files/imapd.sh
index a08c94fc3ad7..5453fc5ba90e 100644
--- a/mail/cyrus-imapd24/files/imapd.sh
+++ b/mail/cyrus-imapd24/files/imapd.sh
@@ -10,7 +10,7 @@ start)
 	fi
 	;;
 stop)
-	kill `ps -a | awk '/cyrus\/bin\/master$/ {print $1}'` && \
+	kill `ps -U cyrus | awk '/master/ {print $1}'` && echo -n ' imapd'
 		echo -n ' imapd'
 	;;
 *)