diff --git a/sysutils/gkrelltop/Makefile b/sysutils/gkrelltop/Makefile
index f759d7f50418..8be953437d23 100644
--- a/sysutils/gkrelltop/Makefile
+++ b/sysutils/gkrelltop/Makefile
@@ -1,16 +1,11 @@
-# New ports collection makefile for:	gkrelltop
-# Date created:				12 April 2004
-# Whom:					David Gardner
-#
+# Whom: David Gardner
 # $FreeBSD$
-#
 
 PORTNAME=	gkrelltop
-PORTVERSION=	2.2.6
-PORTREVISION=	12
+PORTVERSION=	2.2.10
 CATEGORIES=	sysutils
-MASTER_SITES=	http://psychology.rutgers.edu/~zaimi/html/gkrelltop/
-DISTNAME=	${PORTNAME}_2.2-6
+MASTER_SITES=	SF
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	david@pinko.net
 COMMENT=	Plugin for gkrellm 2.x shows top three processes, requires procfs
@@ -18,7 +13,7 @@ COMMENT=	Plugin for gkrellm 2.x shows top three processes, requires procfs
 RUN_DEPENDS=	gkrellmd:${PORTSDIR}/sysutils/gkrellm2
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-USE_GMAKE=	yes
+USES=		gmake
 MAKE_ARGS=	INSTALLDIR=${LOCALBASE}/libexec/gkrellm2/plugins \
 		INSTALLDIRD=${PREFIX}/libexec/gkrellm2/plugins-gkrellmd
 
@@ -30,7 +25,7 @@ PLIST_SUB+=	CLIENT="@comment "
 PLIST_SUB+=	CLIENT=""
 .endif
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 
 post-patch:
 .if defined(GKRELLM_SERVER_ONLY)
diff --git a/sysutils/gkrelltop/distinfo b/sysutils/gkrelltop/distinfo
index 4d58c28c9063..ecb0f6726d34 100644
--- a/sysutils/gkrelltop/distinfo
+++ b/sysutils/gkrelltop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gkrelltop_2.2-6.tar.gz) = 8ba11fbbfd5b1cdf33ef489310b565c8dc4252d54ee406effabb43d7ce7cd1d3
-SIZE (gkrelltop_2.2-6.tar.gz) = 23384
+SHA256 (gkrelltop_2.2.10.orig.tar.gz) = 7975dcd2b242639948ad69d07b347037dd6074b37eead80aaf544aa48ec45c6c
+SIZE (gkrelltop_2.2.10.orig.tar.gz) = 46018
diff --git a/sysutils/gkrelltop/files/patch-Makefile b/sysutils/gkrelltop/files/patch-Makefile
index 9fdb4987f4bd..ed512e0afa5a 100644
--- a/sysutils/gkrelltop/files/patch-Makefile
+++ b/sysutils/gkrelltop/files/patch-Makefile
@@ -1,18 +1,18 @@
---- Makefile.orig	Fri Dec 10 19:50:39 2004
-+++ Makefile	Mon Jun 13 08:29:12 2005
+--- Makefile.orig	2007-07-21 04:52:00.000000000 +0000
++++ Makefile
 @@ -28,9 +28,9 @@
- OSFLAG = `uname | tr '[:lower:]' '[:upper:]'`
+ OSFLAG = $(shell uname | tr '[:lower:]' '[:upper:]')
  SHELL=/bin/sh
  
 -GKRELL1FLAG=1
 +GKRELL1FLAG=0
  #find out if we have gkrellm 2 or 1 (from the gtk+ version)
 -GKRELL1FLAG=$(shell bash -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0')
-+#GKRELL1FLAG=$(shell sh -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0')
- GKRELLTOP= gkrelltop.so
++#GKRELL1FLAG=$(shell bash -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0')
+ GKRELLTOP = gkrelltop.so
  OBJ = top_three.o gkrelltop.o 
  EXTRA = krell_panel1.xpm
-@@ -61,11 +61,11 @@
+@@ -65,11 +65,11 @@ WANT_GLIB12 = yes
  endif
  
  ifeq ($(WANT_GLIB12),yes)
@@ -25,4 +25,4 @@
 +CFLAGSD = -D$(OSFLAG) -I${PREFIX}/include -fPIC -Wall `pkg-config glib-2.0 --cflags`
  LIBSD = `pkg-config glib-2.0 --libs`
  endif
- INSTALLDIRD=$(HOME)/.gkrellm2/plugins-gkrellmd
+ INSTALLDIRD ?= $(PREFIXD)/$(DESTDIR)
diff --git a/sysutils/gkrelltop/files/patch-gkrelltop.c b/sysutils/gkrelltop/files/patch-gkrelltop.c
deleted file mode 100644
index 3d9c9e88597a..000000000000
--- a/sysutils/gkrelltop/files/patch-gkrelltop.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- gkrelltop.c.orig	Thu Aug  4 21:08:58 2005
-+++ gkrelltop.c	Thu Aug  4 21:09:34 2005
-@@ -324,7 +324,8 @@
-     TextStyle *ts, *ts_alt;
-     gint y;
-     gint i;
--
-+    GkrellmPiximage *krell_image = NULL;
-+    
-     /* See comments about first create in demo2.c
-      */
-     if (first_create)
-@@ -335,7 +336,6 @@
-     ts = gkrellm_meter_textstyle(style_id); //smaller font e brighter col 
-     ts_alt = gkrellm_meter_alt_textstyle(style_id); //smaller font e brighter col 
- 
--    GkrellmPiximage *krell_image = NULL;
-     //krell_image = gkrellm_krell_meter_piximage(style_id);
-     gkrellm_load_piximage("krell_panel1", krell_panel1_xpm, &krell_image, STYLE_NAME);
- /*
diff --git a/sysutils/gkrelltop/files/patch-top__three.c b/sysutils/gkrelltop/files/patch-top__three.c
new file mode 100644
index 000000000000..b94e63ad030c
--- /dev/null
+++ b/sysutils/gkrelltop/files/patch-top__three.c
@@ -0,0 +1,12 @@
+--- top_three.c.orig	2009-07-24 03:53:17.000000000 +0000
++++ top_three.c
+@@ -16,6 +16,9 @@
+  * because every OS has it's own way of revealing CPU/memory usage.
+  * compile with gcc -DOS ...
+  */
++#if defined(DRAGONFLY)
++#define FREEBSD
++#endif
+ #if defined(FREEBSD)
+ #define OS_DEFINED
+ #endif        /* defined(FREEBSD) */