diff --git a/misc/quotes/Makefile b/misc/quotes/Makefile
index 6c0e7d11eeb0..96758cc3e6fc 100644
--- a/misc/quotes/Makefile
+++ b/misc/quotes/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	quotes
-PORTVERSION=	1.7.2
+DISTVERSION=	1.7-2
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.externet.hu/.lib/disk6/linuxberg/files/console/office/ \
 		ftp://ftp.waseda.ac.jp/.u7/ports/distfiles/ \
 		http://freebsd.unixfreunde.de/sources/
-DISTNAME=	${PORTNAME}-1.7-2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quote, currency, and Slashdot headline fetcher based on Perl
@@ -33,7 +33,10 @@ do-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}
 	@ ${INSTALL_DATA} ${WRKSRC}/quotes.txt ${DOCSDIR}
-	@ ${INSTALL_DATA} ${WRKSRC}/QuExample.pm ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@ ${MKDIR} ${EXAMPLESDIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/QuExample.pm ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/quotes/pkg-descr b/misc/quotes/pkg-descr
index 02c9fec39605..c4cfce1ec29b 100644
--- a/misc/quotes/pkg-descr
+++ b/misc/quotes/pkg-descr
@@ -4,7 +4,6 @@ expensive in Europe. It has the capability of emailing these
 to you at so and so time designated by a crontab entry for its
 automailing program. This entire package is based on Perl.
 
-WWW: http://www.iae.nl/users/grimaldo/OpenSoft/quotes.shtml
 Author: D. Emilio Grimaldo Tunon <grimaldo@panama.iaehv.nl>
 
 --Dima
diff --git a/misc/quotes/pkg-plist b/misc/quotes/pkg-plist
index b8383ab085ea..3b8bfb103701 100644
--- a/misc/quotes/pkg-plist
+++ b/misc/quotes/pkg-plist
@@ -1,6 +1,7 @@
 bin/quotes
 bin/quotesmailer
 etc/quotesrc.sample
-%%DOCSDIR%%/quotes.txt
-%%DOCSDIR%%/QuExample.pm
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/quotes.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/QuExample.pm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%