diff --git a/graphics/jhead/Makefile b/graphics/jhead/Makefile
index 49971d9516e0..e709ef58426a 100644
--- a/graphics/jhead/Makefile
+++ b/graphics/jhead/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	jhead
 PORTVERSION=	3.04
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.sentex.net/~mwandel/${PORTNAME}/ \
+MASTER_SITES=	http://www.sentex.net/~mwandel/jhead/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -16,16 +16,16 @@ USES=		jpeg:run
 
 MAKEFILE=	makefile
 
-PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
+PLIST_FILES=	bin/jhead \
+		share/man/man1/jhead.1.gz
 PORTDOCS=	usage.html
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^CFLAGS=/d' ${WRKSRC}/${MAKEFILE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/
+	${INSTALL_PROGRAM} ${WRKSRC}/jhead ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/jhead.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/