diff --git a/x11/mouseclock/Makefile b/x11/mouseclock/Makefile
index adcb91eef04..c636377ec3c 100644
--- a/x11/mouseclock/Makefile
+++ b/x11/mouseclock/Makefile
@@ -3,31 +3,30 @@
 # Date created:		May 19 1998
 # Whom:			Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.6 2000/04/09 17:38:43 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2000/05/17 16:20:13 espie Exp $
 #
 
 DISTNAME=	mouseclock-1.0
 CATEGORIES=	x11
-FAKE=No
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/clocks
 
 MAINTAINER=	angelos@openbsd.org
 
 LICENSE_TYPE=		GPL
-PERMIT_PACKAGE_CDROM=	YES
-PERMIT_PACKAGE_FTP=	YES
-PERMIT_DISTFILES_CDROM=	YES
-PERMIT_DISTFILES_FTP=	YES
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
 
-USE_GMAKE=	yes
-USE_IMAKE=	yes
+USE_IMAKE=	Yes
 XMKMF=		xmkmf
 NO_INSTALL_MANPAGES= yes
+FAKE=		Yes
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@mkdir -p ${PREFIX}/share/doc/mouseclock
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mouseclock
 	@${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/mouseclock
 .endif
 
diff --git a/x11/mouseclock/patches/patch-aa b/x11/mouseclock/patches/patch-aa
index 00b230a5ac0..66889d9bcc5 100644
--- a/x11/mouseclock/patches/patch-aa
+++ b/x11/mouseclock/patches/patch-aa
@@ -1,6 +1,6 @@
---- mouseclock.c.orig	Sun May  5 09:47:18 1996
-+++ mouseclock.c	Mon Oct  6 23:09:43 1997
-@@ -31,6 +31,7 @@
+--- mouseclock.c.orig	Sun May  5 18:47:18 1996
++++ mouseclock.c	Wed May 17 18:05:35 2000
+@@ -31,6 +31,7 @@ int Scr;
  Window Root;
  int shadow_size = 2;
  int shadow_mode = 1;
@@ -8,7 +8,7 @@
  
  /* ---------------------------------------------------------------- */
  void
-@@ -56,6 +57,7 @@
+@@ -56,6 +57,7 @@ usage (const char *nom)
    printf ("-display <dpy>   display name\n");
    printf ("-fg <color>      foreground color\n");
    printf ("-fn <font_name>  font to use\n");
@@ -16,7 +16,7 @@
  
    exit (1);
  }
-@@ -266,6 +268,11 @@
+@@ -266,6 +268,11 @@ main (int argc, char **argv)
  	  shadow_mode = 0;
  	  continue;
  	}
@@ -28,7 +28,7 @@
        usage (argv[0]);
      }
  
-@@ -295,7 +302,7 @@
+@@ -295,7 +302,7 @@ main (int argc, char **argv)
  	  struct tm *now_tm = localtime (&now);
  	  Cursor cur;
  
diff --git a/x11/mouseclock/patches/patch-ab b/x11/mouseclock/patches/patch-ab
index bb75bd7c3dc..277be62a32a 100644
--- a/x11/mouseclock/patches/patch-ab
+++ b/x11/mouseclock/patches/patch-ab
@@ -1,6 +1,5 @@
-*** /dev/null	Tue May 19 02:19:02 1998
---- mouseclock.man	Tue May 19 02:19:23 1998
-***************
-*** 0 ****
---- 1 ----
-+ 
+$OpenBSD: patch-ab,v 1.2 2000/05/17 16:20:14 espie Exp $
+--- mouseclock.man.orig	Wed May 17 18:05:35 2000
++++ mouseclock.man	Wed May 17 18:05:35 2000
+@@ -0,0 +1 @@
++