diff --git a/textproc/isearch/Makefile b/textproc/isearch/Makefile
index 3da7b932ddc..be5b14a2f29 100644
--- a/textproc/isearch/Makefile
+++ b/textproc/isearch/Makefile
@@ -1,15 +1,12 @@
-# $OpenBSD: Makefile,v 1.15 2001/10/28 13:05:49 espie Exp $
-# Original from: Ejovi Nuwere <ejovi@ejovi.net> 
+# $OpenBSD: Makefile,v 1.16 2002/07/26 19:00:15 naddy Exp $
 
 COMMENT=	"text search engine by CNIDR"
 
 #BROKEN=		C++ syntax errors, index.cxx:533: ANSI C++ forbids declaration PhraseLength with no type
 
 DISTNAME=	Isearch-1.14
-PKGNAME=	isearch-1.14	
+PKGNAME=	${DISTNAME:L}
 CATEGORIES=	textproc databases
-NEED_VERSION=	1.402
-MASTER_SITES=	ftp://ftp.cnidr.org/pub/NIDR.tools/Isearch/
 
 # License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -17,8 +14,10 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MASTER_SITES=	ftp://ftp.cnidr.org/pub/software/Isearch/
+
 CONFIGURE_STYLE=	gnu
-MAKE_FLAGS=		CFLAGS='${CFLAGS} -DUNIX'
+MAKE_FLAGS=		CC="${CXX}" CFLAGS="${CXXFLAGS} -DUNIX"
 FAKE_FLAGS=		INSTALL=${WRKINST}${PREFIX}/bin
 
 post-install:
diff --git a/textproc/isearch/patches/patch-Makefile b/textproc/isearch/patches/patch-Makefile
index 661f5e8a711..5d21c8f4cdc 100644
--- a/textproc/isearch/patches/patch-Makefile
+++ b/textproc/isearch/patches/patch-Makefile
@@ -1,3 +1,4 @@
+$OpenBSD: patch-Makefile,v 1.2 2002/07/26 19:00:15 naddy Exp $
 --- Makefile.orig	Thu Dec  5 22:35:46 1996
 +++ Makefile	Sat Apr 22 01:27:42 2000
 @@ -153,7 +153,7 @@ install:
diff --git a/textproc/isearch/pkg/DESCR b/textproc/isearch/pkg/DESCR
index 11076b1efad..da2864ccf52 100644
--- a/textproc/isearch/pkg/DESCR
+++ b/textproc/isearch/pkg/DESCR
@@ -4,5 +4,3 @@ available that contain certain words. Unlike older search systems, Isearch
 does not use a list of keywords or an abstract; every word of every 
 document can be checked. This allows greatly improved chances of 
 discovering new information in old collections.
-
-Nassib Nassar
diff --git a/textproc/isearch/pkg/PLIST b/textproc/isearch/pkg/PLIST
index 43311f09163..eaa969af10c 100644
--- a/textproc/isearch/pkg/PLIST
+++ b/textproc/isearch/pkg/PLIST
@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/04/07 01:54:53 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.3 2002/07/26 19:00:15 naddy Exp $
 bin/Iindex
 bin/Isearch
 bin/Iutil
 share/doc/Isearch/QuickStart.html
 share/doc/Isearch/IsearchFeatures.html
 share/doc/Isearch/IsearchTutorial.html
-
+@dirrm share/doc/Isearch