diff --git a/www/tidy/Makefile b/www/tidy/Makefile
index 77e4247b052..f266f343bdd 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.4 2000/03/24 22:12:03 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2000/05/20 00:31:53 rohee Exp $
 # Original from: Bruno Rohée <rohee@OpenBSD.ORG>
 
-TIDYDATE=	13jan00
+TIDYDATE=	30apr00
 DISTNAME=	tidy${TIDYDATE}
 PKGNAME=	tidy-${TIDYDATE}
 
diff --git a/www/tidy/files/md5 b/www/tidy/files/md5
index 0945780b7d3..f740c9790cb 100644
--- a/www/tidy/files/md5
+++ b/www/tidy/files/md5
@@ -1,3 +1,3 @@
-MD5 (tidy13jan00.tgz) = 4ee20c19df8e27b0bb57d0525404075c
-RMD160 (tidy13jan00.tgz) = 1f6ed942c1bb76d282d482723b530a73b996ee05
-SHA1 (tidy13jan00.tgz) = 60fc5a869bed134435083201d2276a62466d0845
+MD5 (tidy30apr00.tgz) = e0a4a6eb7407806f6810d1ca6fd8d7cf
+RMD160 (tidy30apr00.tgz) = db5bf8a342ad4bade7771bcfe4aaa67332955011
+SHA1 (tidy30apr00.tgz) = cf89b58f4435acde52bea1b07cb6dc233527d11d
diff --git a/www/tidy/patches/patch-parser_c b/www/tidy/patches/patch-parser_c
index 5f83ec9aefe..3a7c40580fd 100644
--- a/www/tidy/patches/patch-parser_c
+++ b/www/tidy/patches/patch-parser_c
@@ -1,11 +1,11 @@
-$OpenBSD: patch-parser_c,v 1.1.1.1 2000/02/09 23:55:44 rohee Exp $
+$OpenBSD: patch-parser_c,v 1.2 2000/05/20 00:31:53 rohee Exp $
 
-Was a core fixer in the previous version, should still be useful with
+Was a core fixer in a previous version, should still be useful with
 this one.
 
---- parser.c.orig	Thu Jan 13 12:53:06 2000
-+++ parser.c	Mon Feb  7 21:34:16 2000
-@@ -417,6 +417,9 @@ Bool InsertMisc(Node *element, Node *nod
+--- parser.c.orig	Sun Apr 30 11:23:55 2000
++++ parser.c	Sat May 20 02:11:48 2000
+@@ -415,6 +415,9 @@
  
  void ParseTag(Lexer *lexer, Node *node, uint mode)
  {
@@ -15,7 +15,7 @@ this one.
      if (node->tag->model & CM_EMPTY)
      {
          lexer->waswhite = no;
-@@ -1542,7 +1545,7 @@ void ParseList(Lexer *lexer, Node *list,
+@@ -1583,7 +1586,7 @@
              continue;
          }
  
diff --git a/www/tidy/patches/patch-platform_h b/www/tidy/patches/patch-platform_h
index a0ee565ea69..5025914f0f0 100644
--- a/www/tidy/patches/patch-platform_h
+++ b/www/tidy/patches/patch-platform_h
@@ -1,19 +1,28 @@
-$OpenBSD: patch-platform_h,v 1.1.1.1 2000/02/09 23:55:44 rohee Exp $
+$OpenBSD: patch-platform_h,v 1.2 2000/05/20 00:31:53 rohee Exp $
 
-Patch around ugly glibc workaround.
-
---- platform.h.orig	Mon Feb  7 22:01:16 2000
-+++ platform.h	Mon Feb  7 22:02:56 2000
-@@ -69,8 +69,12 @@
+--- platform.h.orig	Sun Apr 30 11:25:15 2000
++++ platform.h	Sat May 20 02:04:51 2000
+@@ -17,9 +17,9 @@
+   It enables tidy to find config files named ~/.tidyrc
+   and ~your/.tidyrc etc if the HTML_TIDY environment
+   variable is not set. Contributed by Todd Lewis.
++*/
+ 
+ #define SUPPORT_GETPWNAM
+-*/
+ 
+ #include <ctype.h>
+ #include <stdio.h>
+@@ -68,12 +68,6 @@
+ /* hack for gnu sys/types.h file  which defines uint and ulong */
  /* you may need to delete the #ifndef and #endif on your system */
  
- #ifndef __USE_MISC
-+/* This is already defined under OpenBSD, in <sys/types.h> */
-+
-+/*
- typedef unsigned int uint;
- typedef unsigned long ulong;
-+*/
- #endif /* __USE_MISC */
- 
+-#ifndef __USE_MISC
+-#ifndef _INCLUDE_HPUX_SOURCE
+-typedef unsigned int uint;
+-#endif /* _INCLUDE_HPUX_SOURCE */
+-typedef unsigned long ulong;
+-#endif  /* __USE_MISC */
  typedef unsigned char byte;
+ 
+ typedef char *UTF8;
diff --git a/www/tidy/pkg/PLIST b/www/tidy/pkg/PLIST
index cfe558e1c5b..f3d51365724 100644
--- a/www/tidy/pkg/PLIST
+++ b/www/tidy/pkg/PLIST
@@ -3,6 +3,7 @@ bin/tidy
 man/man1/tidy.1
 share/doc/tidy/Overview.html
 share/doc/tidy/grid.gif
+share/doc/tidy/pending.html
 share/doc/tidy/release-notes.html
 share/doc/tidy/tidy.gif
 @dirrm share/doc/tidy