diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 19ebbb117e81..8fe381faf01e 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nginx
-PORTVERSION=	0.7.47
+PORTVERSION=	0.7.50
 CATEGORIES=	www
 MASTER_SITES=	http://sysoev.ru/nginx/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
@@ -37,6 +37,7 @@ OPTIONS=	DEBUG "Enable nginx debugging" off \
 		HTTP_STATUS_MODULE "Enable http_stub_status module" on \
 		HTTP_SUB_MODULE "Enable http_sub module" off \
 		HTTP_UPLOAD_MODULE "Enable upload module" off \
+		HTTP_UPSTREAM_FAIR "Enable upstream fair module" off \
 		HTTP_UPSTREAM_KEEPALIVE "Enable upstream keepalive module" off \
 		HTTP_XSLT_MODULE "Enable http_xslt module" off \
 		HTTP_ZIP_MODULE "Enable http_zip module" off \
@@ -175,6 +176,13 @@ DISTFILES+=	nginx_upload_module-${NGINX_UPLOAD_MODULE_VERSION}.tar.gz:upload
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upload_module-${NGINX_UPLOAD_MODULE_VERSION}
 .endif
 
+.if defined(WITH_HTTP_UPSTREAM_FAIR)
+NGINX_UPSTREAM_FAIR_VERSION=	20081012
+MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:upstreamfair/}
+DISTFILES+=	nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}.tar.gz:upstreamfair
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}
+.endif
+
 .if defined(WITH_HTTP_UPSTREAM_KEEPALIVE)
 NGINX_UPSTREAM_KEEPALIVE_VERSION=	0.1
 MASTER_SITES+=	http://mdounin.ru/files/:upstream
@@ -238,6 +246,13 @@ CONFIGURE_ARGS+=--with-mail_ssl_module
 
 PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
+pre-everything::
+.if defined(WITH_HTTP_UPSTREAM_FAIR)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "Enable http_ssl module to build upstream_fair with SSL support"
+	@${ECHO_MSG}
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!' \
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index e6dcc3746145..ed342413bb7a 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (nginx-0.7.47.tar.gz) = cacd309f517a94cc4acdeec86e6871cf
-SHA256 (nginx-0.7.47.tar.gz) = ca84dba43839c5a0f523afe73b4bb97c0d74e63b092df4dd4e4b5cba2b2e8b71
-SIZE (nginx-0.7.47.tar.gz) = 579417
+MD5 (nginx-0.7.50.tar.gz) = dcf452b87d7fa70f4c3fd62556652c37
+SHA256 (nginx-0.7.50.tar.gz) = 355a7461d81c76f0d1e9579dcf2a1df9b3a65cd7f16bbdf1f27c58901687ead0
+SIZE (nginx-0.7.50.tar.gz) = 580341
 MD5 (nginx-accesskey-2.0.3.tar.gz) = 9b5304346d5139b1841f5baa01ab0cbe
 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
 SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632
@@ -13,6 +13,9 @@ SIZE (ngx_http_response-0.3.tar.gz) = 2244
 MD5 (nginx_upload_module-2.0.8.tar.gz) = 308d43743158263b0d5016aeffadaaa7
 SHA256 (nginx_upload_module-2.0.8.tar.gz) = eaacf4dd4d254df5f2666e13f07edd8c1c7e51ddfe625b88e422583cfbcb6165
 SIZE (nginx_upload_module-2.0.8.tar.gz) = 17497
+MD5 (nginx_upstream_fair-20081012.tar.gz) = 1f7b4f3e47c32f89afac59fa60381dc4
+SHA256 (nginx_upstream_fair-20081012.tar.gz) = 4c2bd957168008e5b2397fad49824ca70f3685cf884e8d1be45d56c8e3bbe88c
+SIZE (nginx_upstream_fair-20081012.tar.gz) = 10021
 MD5 (ngx_http_upstream_keepalive-0.1.tar.gz) = 89c5887abfdacb87e2d21b2973d69cdd
 SHA256 (ngx_http_upstream_keepalive-0.1.tar.gz) = a0929ddff8dcf451731c95b077374b15e4306db8e83322aab6183cfed7307915
 SIZE (ngx_http_upstream_keepalive-0.1.tar.gz) = 4978