diff --git a/devel/doc++/Makefile b/devel/doc++/Makefile
index bf768e37e07..c68660416a4 100644
--- a/devel/doc++/Makefile
+++ b/devel/doc++/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2001/11/13 22:13:22 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2002/03/15 06:50:11 kevlo Exp $
 
 COMMENT=	"documentation system for C, C++, IDL and Java"
 
-DISTNAME=	doc++-3.4.8
+DISTNAME=	doc++-3.4.9
 CATEGORIES=	devel
-NEED_VERSION=	1.496
+NEED_VERSION=	1.510
 
 HOMEPAGE=	http://docpp.sourceforge.net/
 
@@ -15,15 +15,18 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/doctools 
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	docpp
 
-RUN_DEPENDS=	:ghostscript-*:print/ghostscript/gnu \
+RUN_DEPENDS=	:ghostscript-*:print/ghostscript/gnu \ 
 		:teTeX_base-*:print/teTeX/base
 
 USE_GMAKE=	Yes
-
 CONFIGURE_STYLE= gnu
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+MODULES=	gettext
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/doc++
diff --git a/devel/doc++/distinfo b/devel/doc++/distinfo
new file mode 100644
index 00000000000..689b2e00c2d
--- /dev/null
+++ b/devel/doc++/distinfo
@@ -0,0 +1,3 @@
+MD5 (doc++-3.4.9.tar.gz) = e7d7d2005acaf1bf23e7ce63180f0c2d
+RMD160 (doc++-3.4.9.tar.gz) = 3de7e596767f5b64bb703fc58ce75a5ec71c2531
+SHA1 (doc++-3.4.9.tar.gz) = 962e34a801290cbebc23784bb7e69047b9d58e3e
diff --git a/devel/doc++/files/md5 b/devel/doc++/files/md5
deleted file mode 100644
index e4c58800ab4..00000000000
--- a/devel/doc++/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (doc++-3.4.8.tar.gz) = b37114a3a87fa00dd79def01e064c5a9
-RMD160 (doc++-3.4.8.tar.gz) = c40210562775bdd2d9602cf264e5c015d284b117
-SHA1 (doc++-3.4.8.tar.gz) = dc7d500a052406040f413244533c265c8c6f0563
diff --git a/devel/doc++/pkg/PLIST b/devel/doc++/pkg/PLIST
index cfd2a05f302..8d5e2fc40bc 100644
--- a/devel/doc++/pkg/PLIST
+++ b/devel/doc++/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2001/03/03 04:04:36 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.3 2002/03/15 06:50:17 kevlo Exp $
 bin/doc++
 bin/docify
 bin/promote
@@ -38,7 +38,5 @@ share/doc/doc++/toc.html
 share/locale/fr/LC_MESSAGES/doc++.mo
 share/locale/ja/LC_MESSAGES/doc++.mo
 share/locale/ro/LC_MESSAGES/doc++.mo
-share/locale/rudos/LC_MESSAGES/doc++.mo
-share/locale/rukoi8/LC_MESSAGES/doc++.mo
-share/locale/ruwin/LC_MESSAGES/doc++.mo
+share/locale/ru/LC_MESSAGES/doc++.mo
 @dirrm share/doc/doc++