diff --git a/www/yaws/Makefile b/www/yaws/Makefile
index cb634ff1e122..9558dd5111b0 100644
--- a/www/yaws/Makefile
+++ b/www/yaws/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	yaws
-PORTVERSION=	1.80
+PORTVERSION=	1.81
 CATEGORIES=	www
 MASTER_SITES=	http://yaws.hyber.org/download/
 
@@ -68,10 +68,6 @@ do-install:
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/www/yaws
 	@${INSTALL_MAN} ${WRKSRC}/man/*.1 ${MANPREFIX}/man/man1
 	@${INSTALL_MAN} ${WRKSRC}/man/*.5 ${MANPREFIX}/man/man5
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/yaws.pdf ${DOCSDIR}
-.endif
 
 post-install:
 	@${LN} -sf ${PORTNAME}-${PORTVERSION} ${PREFIX}/lib/erlang/lib/${PORTNAME}
diff --git a/www/yaws/distinfo b/www/yaws/distinfo
index 7cab83e3835c..0dc4994ecbc9 100644
--- a/www/yaws/distinfo
+++ b/www/yaws/distinfo
@@ -1,3 +1,3 @@
-MD5 (yaws-1.80.tar.gz) = 5d8842fba760480e0db68de9e6379c16
-SHA256 (yaws-1.80.tar.gz) = 6fb92ed0acce0c07facf81f12612015300142fe946f50a1c6852518a1aa8f68d
-SIZE (yaws-1.80.tar.gz) = 917595
+MD5 (yaws-1.81.tar.gz) = 6558f194aeaf6facffbed78ad87b36af
+SHA256 (yaws-1.81.tar.gz) = 65d3307aee8753adb9c2ca6358a733edfe3d2f77dc7fcc195d5aad02bfff52fe
+SIZE (yaws-1.81.tar.gz) = 779056
diff --git a/www/yaws/pkg-plist b/www/yaws/pkg-plist
index 40e27d577bb0..33e3eec3c123 100644
--- a/www/yaws/pkg-plist
+++ b/www/yaws/pkg-plist
@@ -71,6 +71,7 @@ etc/yaws.conf.sample
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_dav.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_debug.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_debug.hrl
+%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_dime.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_generated.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_html.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_jsonrpc.erl
@@ -95,7 +96,6 @@ etc/yaws.conf.sample
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_xmlrpc.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_zlib.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/ymnesia.erl
-%%PORTDOCS%%%%DOCSDIR%%/yaws.pdf
 %%WWWDIR%%/END
 %%WWWDIR%%/END2
 %%WWWDIR%%/HEAD
@@ -274,17 +274,17 @@ etc/yaws.conf.sample
 %%WWWDIR%%/session1.yaws
 %%WWWDIR%%/setcookie.yaws
 %%WWWDIR%%/setpcookie.yaws
-%%WWWDIR%%/shopingcart/Makefile
-%%WWWDIR%%/shopingcart/buy.yaws
-%%WWWDIR%%/shopingcart/index.yaws
-%%WWWDIR%%/shopingcart/junk.jpg
-%%WWWDIR%%/shopingcart/loginpost.yaws
-%%WWWDIR%%/shopingcart/logout.yaws
-%%WWWDIR%%/shopingcart/shopcart.beam
-%%WWWDIR%%/shopingcart/shopcart.erl
-%%WWWDIR%%/shopingcart/shopcart_form.yaws
-%%WWWDIR%%/shopingcart/source.html
-%%WWWDIR%%/shopingcart/style.css
+%%WWWDIR%%/shoppingcart/Makefile
+%%WWWDIR%%/shoppingcart/buy.yaws
+%%WWWDIR%%/shoppingcart/index.yaws
+%%WWWDIR%%/shoppingcart/junk.jpg
+%%WWWDIR%%/shoppingcart/loginpost.yaws
+%%WWWDIR%%/shoppingcart/logout.yaws
+%%WWWDIR%%/shoppingcart/shopcart.beam
+%%WWWDIR%%/shoppingcart/shopcart.erl
+%%WWWDIR%%/shoppingcart/shopcart_form.yaws
+%%WWWDIR%%/shoppingcart/source.html
+%%WWWDIR%%/shoppingcart/style.css
 %%WWWDIR%%/simple.yaws
 %%WWWDIR%%/simple_ex1.yaws
 %%WWWDIR%%/simple_ex2.yaws
@@ -314,7 +314,7 @@ etc/yaws.conf.sample
 %%WWWDIR%%/yman.yaws
 @dirrm %%WWWDIR%%/testdir
 @dirrm %%WWWDIR%%/ssi
-@dirrm %%WWWDIR%%/shopingcart
+@dirrm %%WWWDIR%%/shoppingcart
 @dirrm %%WWWDIR%%/jsolait/lib
 @dirrm %%WWWDIR%%/jsolait
 @dirrm %%WWWDIR%%/icons/small
@@ -322,7 +322,6 @@ etc/yaws.conf.sample
 @dirrm %%WWWDIR%%/code
 @dirrm %%WWWDIR%%/cgi-bin
 @dirrm %%WWWDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src
 @dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/lib
 @dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv