diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 2aceb6e07de..ed2f91839f5 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2002/11/28 22:38:41 jakob Exp $
+# $OpenBSD: Makefile,v 1.30 2002/12/07 16:51:14 jakob Exp $
 
 COMMENT=		interactive spelling checker
 COMMENT-french=		ispell dictionary for French
@@ -7,6 +7,7 @@ COMMENT-swedish=	ispell dictionary for Swedish
 COMMENT-russian=	ispell dictionary for Russian
 COMMENT-portuguese=	ispell dictionary for Rortuguese
 COMMENT-slovak=		ispell dictionary for Slovak
+COMMENT-spanish=	ispell dictionary for Spanish
 
 VERSION=	3.2.06
 DISTNAME=	ispell-${VERSION}
@@ -25,6 +26,7 @@ MASTER_SITES3=	ftp://mch5.chem.msu.su/pub/russian/ispell/ \
 		ftp://ftp.afti.nsu.ru/pub/mirrors/russian-ispell/
 MASTER_SITES4=	http://natura.di.uminho.pt/~jj/pln/
 MASTER_SITES5=	http://ispell.hq.sk/
+MASTER_SITES6=	ftp://ftp.fi.upm.es/pub/unix/
 
 DIST_SUBDIR=	ispell
 
@@ -34,6 +36,7 @@ SWEDISH_DICT=		iswedish-1.2.1
 RUSSIAN_DICT=		rus-ispell-0.99e7
 PORTUGUESE_DICT=	UMportugues
 SLOVAK_DICT=		ispell-sk-0.1.10
+SPANISH_DICT=		espa~nol
 
 DISTFILES=	${DISTNAME}.tar.gz \
 		${FRENCH_DICT}.tar.gz:0 \
@@ -41,16 +44,18 @@ DISTFILES=	${DISTNAME}.tar.gz \
 		${SWEDISH_DICT}.tar.gz:2 \
 		${RUSSIAN_DICT}.tar.gz:3 \
 		${PORTUGUESE_DICT}.tgz:4 \
-		${SLOVAK_DICT}.tar.gz:5
+		${SLOVAK_DICT}.tar.gz:5  \
+		${SPANISH_DICT}.tar.gz:6
 
 EXTRACT_ONLY=	${DISTNAME}.tar.gz \
 		${SWEDISH_DICT}.tar.gz \
 		${PORTUGUESE_DICT}.tgz \
-		${SLOVAK_DICT}.tar.gz
+		${SLOVAK_DICT}.tar.gz  \
+		${SPANISH_DICT}.tar.gz
 
 SUBST_VARS+=	VERSION
 
-MULTI_PACKAGES=	-french -german -swedish -russian -portuguese -slovak
+MULTI_PACKAGES=	-french -german -swedish -russian -portuguese -slovak -spanish
 .for i in ${MULTI_PACKAGES}
 PKGNAME$i=	ispell$i-${VERSION}
 .endfor
@@ -81,6 +86,10 @@ post-extract:
 	@mkdir -p ${WRKDIR}/russian
 	@(cd ${WRKDIR}/russian; \
 	tar xzf ${DISTDIR}/${DIST_SUBDIR}/${RUSSIAN_DICT}.tar.gz)
+	
+	@(cd ${WRKDIR}/${SPANISH_DICT}-1.7/; \
+	mv espa~nol.aff spanish.aff; \
+	mv espa~nol.words+ spanish.words+)
 
 post-patch:
 	@sed "s%/usr/local%${PREFIX}%g" ${WRKSRC}/local.h.samp > \
@@ -115,6 +124,9 @@ post-build:
 	cat *.words | sort -u -f > slovak.words; \
 	${WRKDIST}/buildhash slovak.words slovak.aff slovak.hash)
 
+	@(cd ${WRKDIR}/${SPANISH_DICT}-1.7; \
+	${WRKDIST}/buildhash spanish.words+ spanish.aff spanish.hash)
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIST}/ispell ${PREFIX}/bin/ispell
 	${INSTALL_PROGRAM} ${WRKDIST}/buildhash ${PREFIX}/bin/buildhash
@@ -160,5 +172,7 @@ do-install:
 		${PREFIX}/lib/ispell
 	${INSTALL_DATA} ${WRKDIR}/${SLOVAK_DICT}/slovak.{aff,hash} \
 		${PREFIX}/lib/ispell
+	${INSTALL_DATA} ${WRKDIR}/${SPANISH_DICT}-1.7/spanish.{aff,hash} \
+		${PREFIX}/lib/ispell
 
 .include <bsd.port.mk>
diff --git a/textproc/ispell/distinfo b/textproc/ispell/distinfo
index f616df50e29..6c2bcfca263 100644
--- a/textproc/ispell/distinfo
+++ b/textproc/ispell/distinfo
@@ -1,4 +1,5 @@
 MD5 (ispell/UMportugues.tgz) = 39fd3c33b13838ca1e9121c3d901b396
+MD5 (ispell/espa~nol.tar.gz) = a5b5a6b1e3003d81a2c78648dd1c1362
 MD5 (ispell/francais-IREQ-1.4.tar.gz) = 3871371b0f8e57b554f8895ce3a43b5a
 MD5 (ispell/hk2-deutsch.tar.gz) = 7fa72ab88d3ef466e35cf0721140b8ec
 MD5 (ispell/ispell-3.2.06.tar.gz) = d434e1aef1a815294d5012c60c4c414a
@@ -6,6 +7,7 @@ MD5 (ispell/ispell-sk-0.1.10.tar.gz) = 09e91affa50cf449f48ea0c88e68a145
 MD5 (ispell/iswedish-1.2.1.tar.gz) = b546aeb88d7614c32e541488d55f32fe
 MD5 (ispell/rus-ispell-0.99e7.tar.gz) = 37f52c405c6026c5e792545666758961
 RMD160 (ispell/UMportugues.tgz) = b978d4511ed1cf8ef864ca4c220034e635b19563
+RMD160 (ispell/espa~nol.tar.gz) = be9692aa6c97f0ecefc1143bffd8edc5ac22f019
 RMD160 (ispell/francais-IREQ-1.4.tar.gz) = 9f11a627d84488c9cbbd37b75fbeae9060803f3d
 RMD160 (ispell/hk2-deutsch.tar.gz) = 8fe8dadac0ab8bead960915284b3fd89646db968
 RMD160 (ispell/ispell-3.2.06.tar.gz) = 3f6a3840540ebc753146c427da8ce2d54317b46e
@@ -13,6 +15,7 @@ RMD160 (ispell/ispell-sk-0.1.10.tar.gz) = 20f392a7b6c1864936c148730b4e110b3a7b61
 RMD160 (ispell/iswedish-1.2.1.tar.gz) = 4d5a040018b12d06f4d8f45f89eb775ba6f88aab
 RMD160 (ispell/rus-ispell-0.99e7.tar.gz) = b022ad1b2603530dec6e8f45d1437e69fe10ba8e
 SHA1 (ispell/UMportugues.tgz) = c69d7cca0983421dd9668aa93d21b648ca89f0c6
+SHA1 (ispell/espa~nol.tar.gz) = de8a2f2dbab0d3658aecd7ef109e91773da23dd7
 SHA1 (ispell/francais-IREQ-1.4.tar.gz) = 940712167cd2d40c27e673246b8ce9f99595a309
 SHA1 (ispell/hk2-deutsch.tar.gz) = 4e6364b65981be8002acbb65618bdbc646eb5663
 SHA1 (ispell/ispell-3.2.06.tar.gz) = 35f496322cda172d56610417e4e1c7b962f734d7
diff --git a/textproc/ispell/pkg/DESCR-spanish b/textproc/ispell/pkg/DESCR-spanish
new file mode 100644
index 00000000000..1bd8b70e3cf
--- /dev/null
+++ b/textproc/ispell/pkg/DESCR-spanish
@@ -0,0 +1,6 @@
+Ispell is a fast screen-oriented spelling checker that shows you your
+errors in the context of the original file, and suggests possible
+corrections when it can figure them out.  Compared to UNIX spell, it is
+faster and much easier to use.
+
+This package add a Spanish dictionary that can be used by ispell.
diff --git a/textproc/ispell/pkg/PLIST-spanish b/textproc/ispell/pkg/PLIST-spanish
new file mode 100644
index 00000000000..e4a0c77db30
--- /dev/null
+++ b/textproc/ispell/pkg/PLIST-spanish
@@ -0,0 +1,5 @@
+@comment $OpenBSD: PLIST-spanish,v 1.1 2002/12/07 16:51:14 jakob Exp $
+lib/ispell/spanish.aff
+lib/ispell/spanish.hash
+@exec echo 'invoking %D/bin/ispell-config'
+@exec %D/bin/ispell-config