diff --git a/graphics/wmgrabimage/Makefile b/graphics/wmgrabimage/Makefile
index f58b7293238c..c61770352f67 100644
--- a/graphics/wmgrabimage/Makefile
+++ b/graphics/wmgrabimage/Makefile
@@ -16,15 +16,9 @@ RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmGrabImage
 
-USE_GMAKE=	YES
 USE_X_PREFIX=	YES
 USE_XPM=	YES
 
 MAN1=		wmGrabImage.1
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmGrabImage ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/GrabImage ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/wmGrabImage.1 ${PREFIX}/man/man1
-
 .include <bsd.port.mk>
diff --git a/graphics/wmgrabimage/files/patch-aa b/graphics/wmgrabimage/files/patch-aa
index e56104d25b6f..1704f4dc22f5 100644
--- a/graphics/wmgrabimage/files/patch-aa
+++ b/graphics/wmgrabimage/files/patch-aa
@@ -1,22 +1,44 @@
---- Makefile.orig	Mon Feb  1 15:55:30 1999
-+++ Makefile	Wed Jan  5 14:31:02 2000
-@@ -1,6 +1,7 @@
+--- Makefile.orig	Tue Feb  2 06:55:30 1999
++++ Makefile	Thu Aug 10 22:05:20 2000
+@@ -1,8 +1,8 @@
 -CC     = gcc
 -CFLAGS = -O2 -Wall
 -INCDIR = -I/usr/X11R6/include/X11
+-DESTDIR= /usr/X11R6
+-LIBDIR = -L/usr/X11R6/lib
 +CC     ?= gcc
 +CFLAGS ?= -O2
-+CFLAGS += -Wall
-+INCDIR = -I/usr/X11R6/include
- DESTDIR= /usr/X11R6
- LIBDIR = -L/usr/X11R6/lib
++INCDIR = -I${X11BASE}/include
++DESTDIR= ${PREFIX}
++LIBDIR = -L${X11BASE}/lib
  # for linux
-@@ -12,7 +13,7 @@
+ LIBS   = -lXpm -lX11 -lXext
+ # for Solaris
+@@ -12,14 +12,14 @@
  
  
  .c.o:
 -	$(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
-+	$(CC) $(CFLAGS) -c $< -o $*.o $(INCDIR)
++	$(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR)
  
  
  all:	wmGrabImage.o wmGrabImage
+ 
+ wmGrabImage.o: wmGrabImage_master.xpm wmGrabImage_mask.xbm
+ wmGrabImage:	$(OBJS) 
+-	$(CC) $(CFLAGS) $(SYSTEM) -o wmGrabImage $^ $(INCDIR) $(LIBDIR) $(LIBS)
++	$(CC) $(CFLAGS) $(SYSTEM) -o wmGrabImage $(OBJS) $(LIBDIR) $(LIBS)
+ 
+ clean:
+ 	for i in $(OBJS) ; do \
+@@ -28,7 +28,7 @@
+ 	rm -f wmGrabImage
+ 
+ install:: wmGrabImage
+-	install -s -m 0755 wmGrabImage $(DESTDIR)/bin
+-	install    -m 0755 GrabImage $(DESTDIR)/bin
+-	install    -m 0644 wmGrabImage.1 $(DESTDIR)/man/man1 
++	${BSD_INSTALL_PROGRAM} wmGrabImage $(DESTDIR)/bin
++	${BSD_INSTALL_SCRIPT} GrabImage $(DESTDIR)/bin
++	${BSD_INSTALL_MAN} wmGrabImage.1 $(DESTDIR)/man/man1 
+ 
diff --git a/graphics/wmgrabimage/pkg-descr b/graphics/wmgrabimage/pkg-descr
index ce806259c758..43b53201c1f5 100644
--- a/graphics/wmgrabimage/pkg-descr
+++ b/graphics/wmgrabimage/pkg-descr
@@ -1,4 +1,4 @@
-wmGrabImage is a WindowMaker DockApp that maintains a small thumbnail copy of
+wmGrabImage is a Window Maker DockApp that maintains a small thumbnail copy of
 your favorite image from the WWW.  The image to monitor is specified via the
 "-url <Image URL>" command-line option and it gets updated approximately every
 5 minutes.  The update interval can be overridden via the "-delay <Time>"