diff --git a/www/fcgiwrap/Makefile b/www/fcgiwrap/Makefile
index 24e7876028c6..cfe362d51377 100644
--- a/www/fcgiwrap/Makefile
+++ b/www/fcgiwrap/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	fcgiwrap
 PORTVERSION=	1.1.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	www
 
 MAINTAINER=	rodrigo@FreeBSD.org
diff --git a/www/fcgiwrap/files/fcgiwrap.in b/www/fcgiwrap/files/fcgiwrap.in
index 9ea821d3f418..a909f3d02f38 100644
--- a/www/fcgiwrap/files/fcgiwrap.in
+++ b/www/fcgiwrap/files/fcgiwrap.in
@@ -79,6 +79,11 @@ fcgiwrap_postcmd() {
 			return
 			;;
 	esac
+	# Wait up to 5 seconds for the socket file
+	for i in $(seq 5); do
+		[ -e ${fcgiwrap_socket#unix:} ] && break
+		sleep 1
+	done
 	if [ -n "${fcgiwrap_socket_mode}" ]; then
 		chmod ${fcgiwrap_socket_mode} ${fcgiwrap_socket#unix:}
 	fi