diff --git a/www/yaws/Makefile b/www/yaws/Makefile
index 8711a4855556..29ec4bb807d3 100644
--- a/www/yaws/Makefile
+++ b/www/yaws/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	yaws
-PORTVERSION=	1.82
-PORTREVISION=	1
+PORTVERSION=	1.83
 CATEGORIES=	www
 MASTER_SITES=	http://yaws.hyber.org/download/
 
@@ -31,6 +30,8 @@ OPTIONS=	SENDFILE "Use native sendfile(2) interface" on
 
 APPDIR=${PREFIX}/lib/erlang/lib/yaws-${PORTVERSION}
 
+SUB_FILES=      pkg-message
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SENDFILE)
@@ -46,12 +47,13 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e 's|!!PREFIX!!|${PREFIX}|g' \
 		${WRKSRC}/man/yaws_api.5 ${WRKSRC}/man/yaws.conf.5 \
-		${WRKSRC}/src/yaws_config.erl ${WRKSRC}/scripts/yaws.template
+		${WRKSRC}/README
 	@${FIND} ${WRKSRC} -name \*.orig -or -name \*.bak | ${XARGS} ${RM}
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/yaws ${PREFIX}/bin
-	@${INSTALL_DATA} ${FILESDIR}/yaws.conf.sample ${PREFIX}/etc/
+	@${MKDIR} ${ETCDIR}
+	@${INSTALL_DATA} ${FILESDIR}/yaws.conf.sample ${ETCDIR}
 	@${MKDIR} ${APPDIR}/ebin
 	@${MKDIR} ${APPDIR}/include
 	@${MKDIR} ${APPDIR}/priv
@@ -65,12 +67,13 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/priv/lib/* ${APPDIR}/priv/lib
 	@${INSTALL_DATA} ${WRKSRC}/include/* ${APPDIR}/include
 	@${INSTALL_DATA} ${WRKSRC}/src/*.?rl ${APPDIR}/src
-	@cd ${WRKSRC}/www && (${FIND} * | ${CPIO} -pu ${PREFIX}/www/yaws)
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/www/yaws
+	@cd ${WRKSRC}/www && (${FIND} * | ${CPIO} -pu ${WWWDIR})
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WWWDIR}
 	@${INSTALL_MAN} ${WRKSRC}/man/*.1 ${MANPREFIX}/man/man1
 	@${INSTALL_MAN} ${WRKSRC}/man/*.5 ${MANPREFIX}/man/man5
 
 post-install:
 	@${LN} -sf ${PORTNAME}-${PORTVERSION} ${PREFIX}/lib/erlang/lib/${PORTNAME}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/yaws/distinfo b/www/yaws/distinfo
index d6bb843b9b56..f934ffbd867a 100644
--- a/www/yaws/distinfo
+++ b/www/yaws/distinfo
@@ -1,3 +1,3 @@
-MD5 (yaws-1.82.tar.gz) = 33f01f7def64af5eba0ce62d8cca2bc3
-SHA256 (yaws-1.82.tar.gz) = e1ad2a82e8530ca75e4671205cc92eb255791b086985232995ff8dccdd4dd4ac
-SIZE (yaws-1.82.tar.gz) = 784225
+MD5 (yaws-1.83.tar.gz) = 67bf15e433d2a038bb27c2c5469a2c2d
+SHA256 (yaws-1.83.tar.gz) = a66e4153b98d6652c527b1788c55040edd22ac776181232e277a0462bca61750
+SIZE (yaws-1.83.tar.gz) = 787834
diff --git a/www/yaws/files/patch-README b/www/yaws/files/patch-README
new file mode 100644
index 000000000000..ba9ae64745c3
--- /dev/null
+++ b/www/yaws/files/patch-README
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- README.orig
++++ README
+@@ -70,7 +70,7 @@
+ 
+ 7. This will create a webserver at http://${host} and one at https://${host}
+ 
+-8. as root Edit /etc/yaws.conf 
++8. as root Edit !!PREFIX!!/etc/yaws/yaws.conf
+ 
+ 9. Create content in /var/yaws
+ 
diff --git a/www/yaws/files/patch-man_yaws.conf.5 b/www/yaws/files/patch-man_yaws.conf.5
index 3d9d5ec575a9..b7c527ddc4e3 100644
--- a/www/yaws/files/patch-man_yaws.conf.5
+++ b/www/yaws/files/patch-man_yaws.conf.5
@@ -1,13 +1,13 @@
 
 $FreeBSD$
 
---- man/yaws.conf.5.orig	Fri May 30 12:19:32 2003
-+++ man/yaws.conf.5	Fri May 30 12:20:49 2003
+--- man/yaws.conf.5.orig
++++ man/yaws.conf.5
 @@ -1,6 +1,6 @@
  .TH YAWS.CONF "5" "" "" "User Commands"
  .SH NAME
--/etc/yaws.conf \- Configuration file for the yaws webserver
-+!!PREFIX!!/etc/yaws.conf \- Configuration file for the yaws webserver
+-/etc/yaws/yaws.conf \- Configuration file for the yaws webserver
++!!PREFIX!!/etc/yaws/yaws.conf \- Configuration file for the yaws webserver
  .SH DESCRIPTION
  .\" Add any additional description here
  .PP
diff --git a/www/yaws/files/patch-man_yaws__api.5 b/www/yaws/files/patch-man_yaws__api.5
index d46da6c3f8c3..bb07fb036d87 100644
--- a/www/yaws/files/patch-man_yaws__api.5
+++ b/www/yaws/files/patch-man_yaws__api.5
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- man/yaws_api.5.orig	Fri May 30 12:21:20 2003
-+++ man/yaws_api.5	Fri May 30 12:20:34 2003
-@@ -277,7 +277,7 @@
+--- man/yaws_api.5.orig
++++ man/yaws_api.5
+@@ -343,7 +343,7 @@
  .TP
  \fBsetconf(Gconf, Groups)\fR
  This function is intended for embedded mode in yaws. It makes it possible
 -to load a yaws configuration from another data source than /etc/yaws.conf, such
-+to load a yaws configuration from another data source than !!PREFIX!!/etc/yaws.conf, such
++to load a yaws configuration from another data source than !!PREFIX!!/etc/yaws/yaws.conf, such
  as a database. 
  If yaws is started with the environment \fI{embedded, true}\fR, yaws will
  start with an empty default configuration, and wait for some other
diff --git a/www/yaws/files/pkg-message.in b/www/yaws/files/pkg-message.in
new file mode 100644
index 000000000000..4bdf5928b3fd
--- /dev/null
+++ b/www/yaws/files/pkg-message.in
@@ -0,0 +1 @@
+NOTICE: The default configuration file location changed to %%ETCDIR%%.
diff --git a/www/yaws/pkg-plist b/www/yaws/pkg-plist
index 68c3e58ccda8..bfcf6e661594 100644
--- a/www/yaws/pkg-plist
+++ b/www/yaws/pkg-plist
@@ -1,5 +1,5 @@
 bin/yaws
-etc/yaws.conf.sample
+%%ETCDIR%%/yaws.conf.sample
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/authmod_gssapi.beam
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/haxe.beam
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/json.beam
@@ -34,6 +34,7 @@ etc/yaws.conf.sample
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_session_server.beam
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_soap_lib.beam
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_soap_srv.beam
+%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_stats.beam
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_sup.beam
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_sup_restarts.beam
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_ticker.beam
@@ -89,6 +90,7 @@ etc/yaws.conf.sample
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_showarg.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_soap_lib.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_soap_srv.erl
+%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_stats.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_sup.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_sup_restarts.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_ticker.erl
@@ -327,5 +329,6 @@ etc/yaws.conf.sample
 @dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/include
 @dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin
 @dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%
+@dirrmtry %%ETCDIR%%
 @exec ln -sf yaws-%%VERSION%% %D/lib/erlang/lib/yaws
 @unexec rm -f %D/lib/erlang/lib/yaws