diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 79406fab0e5..81e877673d7 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,15 +1,13 @@
-# $OpenBSD: Makefile,v 1.39 2011/03/09 19:37:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.40 2011/04/09 01:21:55 william Exp $
 
 COMMENT=	robust and small HTTP server and mail proxy server
 
-DISTNAME=	nginx-0.8.53
+DISTNAME=	nginx-0.8.54
 CATEGORIES=	www
 
-REVISION=	7
-
 HOMEPAGE=	http://nginx.net/
 
-MAINTAINER=	William Yodlowsky <bsd@openbsd.rutgers.edu>
+MAINTAINER=	William Yodlowsky <william@openbsd.org>
 
 # BSD-like
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 1167c1b3b24..2b303582aed 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,5 +1,5 @@
-MD5 (nginx-0.8.53.tar.gz) = cX6uobNOhmOEn2S5qgWp2g==
-RMD160 (nginx-0.8.53.tar.gz) = KvDI4Qimijk2rspkbTPOrw8dVsg=
-SHA1 (nginx-0.8.53.tar.gz) = m/ePVe9BqlSrHFyq2UdW2OPhOuw=
-SHA256 (nginx-0.8.53.tar.gz) = irioe+tVXZ6gn+YdDehqcepOkO95cN8NOPes+5vtbc8=
-SIZE (nginx-0.8.53.tar.gz) = 649835
+MD5 (nginx-0.8.54.tar.gz) = RN9OtqItclAhKIxXB4kEbw==
+RMD160 (nginx-0.8.54.tar.gz) = LDVA1I2JwjbBxWKnR2vZw6z4Gys=
+SHA1 (nginx-0.8.54.tar.gz) = TWPDW4l026Qsxi3VBGronfNSjjQ=
+SHA256 (nginx-0.8.54.tar.gz) = EuKO+5pURS+m5XngjOfIZOSdbqYQTMKz3lpEFurZBZM=
+SIZE (nginx-0.8.54.tar.gz) = 650001
diff --git a/www/nginx/pkg/nginx.rc b/www/nginx/pkg/nginx.rc
index 5b2e110754a..fbfdf0c3009 100755
--- a/www/nginx/pkg/nginx.rc
+++ b/www/nginx/pkg/nginx.rc
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: nginx.rc,v 1.7 2011/03/09 19:37:47 ajacoutot Exp $
+# $OpenBSD: nginx.rc,v 1.8 2011/04/09 01:21:55 william Exp $
 
 daemon="${TRUEPREFIX}/sbin/nginx"
 
@@ -13,8 +13,7 @@ rc_reload() {
 }
 
 rc_stop() {
-	${daemon} -s stop
-	[ $? -gt 0 ] && pkill -f "^${pexp}"
+	${daemon} -s stop || pkill -f "^${pexp}"
 }
 
 rc_cmd $1