diff --git a/src/etc/rc.d/mountd b/src/etc/rc.d/mountd
index fb1d7cfa..e9dd3e61 100644
--- a/src/etc/rc.d/mountd
+++ b/src/etc/rc.d/mountd
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: mountd,v 1.2 2011/08/02 11:59:25 robert Exp $
+# $OpenBSD: mountd,v 1.3 2012/08/14 07:43:57 ajacoutot Exp $
 
 daemon="/sbin/mountd"
 
 . /etc/rc.d/rc.subr
 
 rc_pre() {
-	[ -s /etc/exports -a `sed -e '/^#/d' < /etc/exports | wc -l` -ne 0 ] &&
+	[ -s /etc/exports ] && grep -qv '^#' /etc/exports && \
 		rm -f /var/db/mountdtab && \
 		echo -n > /var/db/mountdtab
 }
diff --git a/src/etc/rc.d/nfsd b/src/etc/rc.d/nfsd
index 3911cb5a..39476217 100644
--- a/src/etc/rc.d/nfsd
+++ b/src/etc/rc.d/nfsd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: nfsd,v 1.4 2012/07/10 15:03:24 halex Exp $
+# $OpenBSD: nfsd,v 1.5 2012/08/14 07:43:57 ajacoutot Exp $
 
 daemon="/sbin/nfsd"
 
@@ -11,7 +11,7 @@ pexp="(${daemon}( |$)|nfsd: (master|server)$)"
 rc_reload=NO
 
 rc_pre() {
-	[ -s /etc/exports -a `sed -e '/^#/d' < /etc/exports | wc -l` -ne 0 ]
+	[ -s /etc/exports ] && grep -qv '^#' /etc/exports
 }
 
 rc_cmd $1