diff --git a/mail/hashcash/Makefile b/mail/hashcash/Makefile
index b3f51ef4c3ff..a9890e0ac4b5 100644
--- a/mail/hashcash/Makefile
+++ b/mail/hashcash/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	hashcash
 PORTVERSION=	1.22
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.hashcash.org/source/
 
 MAINTAINER=	chalpin@cs.wisc.edu
 COMMENT=	Anti-spam / denial of service counter-measure tool
 WWW=		http://www.hashcash.org/
 
 LICENSE=	CPL
 LICENSE_NAME=	CPL
 LICENSE_TEXT=	http://www.cypherspace.org/CPL/
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		tar:tgz
 
 PLIST_FILES=	bin/hashcash bin/sha1
-PLIST_FILES+=	man/man1/hashcash.1.gz
-PLIST_FILES+=	man/man1/sha1-hashcash.1.gz
+PLIST_FILES+=	share/man/man1/hashcash.1.gz
+PLIST_FILES+=	share/man/man1/sha1-hashcash.1.gz
 
 PORTDOCS=	CHANGELOG LICENSE README
 ALL_TARGET=	generic
 
 MAKE_ENV+=	STAGEDIR=${STAGEDIR}
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc*}
 USE_GCC=	yes
 .endif
 
 post-patch-DOCS-off:
 	${REINPLACE_CMD} -e '/DOC_INSTALL_PATH/d' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/mail/hashcash/files/patch-Makefile b/mail/hashcash/files/patch-Makefile
index 93b8d83b87f7..32785aa4d5ae 100644
--- a/mail/hashcash/files/patch-Makefile
+++ b/mail/hashcash/files/patch-Makefile
@@ -1,24 +1,24 @@
 --- Makefile.orig	Sat Apr 29 17:33:19 2006
 +++ Makefile	Sat Apr 29 17:34:26 2006
 @@ -2,9 +2,9 @@
  CHANGEME1 = 1 # put PACKAGER = EBUILD|RPM etc here
  CHANGEME2 = 2
  CHANGEME3 = 3
 -INSTALL_PATH = /usr/bin
 -MAN_INSTALL_PATH = /usr/share/man/man1
 -DOC_INSTALL_PATH = /usr/share/doc/hashcash-$(HC_VERS)
 +INSTALL_PATH = ${STAGEDIR}${PREFIX}/bin
-+MAN_INSTALL_PATH = ${STAGEDIR}${PREFIX}/man/man1
++MAN_INSTALL_PATH = ${STAGEDIR}${PREFIX}/share/man/man1
 +DOC_INSTALL_PATH = ${STAGEDIR}${PREFIX}/share/doc/hashcash
  MAKEDEPEND = makedepend
  MSLIB = mslib 
  # here you can choose the regexp style your system has
 @@ -16,7 +16,7 @@
  # 	REGEXP = 
  REGEXP=-DREGEXP_POSIX
  COPT_DEBUG = -g -DDEBUG
 -COPT_GENERIC = -O3
 +#COPT_GENERIC = -O3
  COPT_GNU = -O3 -funroll-loops
  COPT_X86 = -O3 -funroll-loops -march=pentium-mmx -mmmx \
  	-D_REENTRANT -D_THREAD_SAFE -fPIC