diff --git a/lang/elisp-manual/Makefile b/lang/elisp-manual/Makefile
index c6b1fdf446ff..f9c1a22b57b3 100644
--- a/lang/elisp-manual/Makefile
+++ b/lang/elisp-manual/Makefile
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	elisp-manual
-PORTVERSION=	21-2.8
+PORTVERSION=	21.2.8
+PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/}
 
 MAINTAINER=	ports@freebsd.org
 COMMENT=	Emacs Lisp reference manual
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./-/}
 GNU_CONFIGURE=	yes
 
 ALL_TARGET=	elisp