diff --git a/databases/maatkit/Makefile b/databases/maatkit/Makefile
index beb60857486d..18e577f52a9f 100644
--- a/databases/maatkit/Makefile
+++ b/databases/maatkit/Makefile
@@ -1,12 +1,12 @@
-# New ports collection makefile for:	mysqltoolkit
-# Date created:				19 July 2007
+# New ports collection makefile for:	maatkit
+# Date created:				14 December 2007
 # Whom:	      				Steven Kreuzer <skreuzer@exit2shell.com>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	mysqltoolkit
-PORTVERSION=	1053
+PORTNAME=	maatkit
+PORTVERSION=	1674
 CATEGORIES=	databases
 MASTER_SITES=	SF
 
@@ -14,27 +14,27 @@ MAINTAINER=	skreuzer@exit2shell.com
 COMMENT=	Collection of essential command-line utilities for MySQL
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
-		${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
-		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
+				${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
+				${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 
 PERL_CONFIGURE=	yes
 
-MAN1=	mysql-archiver.1 \
-	mysql-checksum-filter.1 \
-	mysql-deadlock-logger.1 \
-	mysql-duplicate-key-checker.1 \
-	mysql-find.1 \
-	mysql-heartbeat.1 \
-	mysql-parallel-dump.1 \
-	mysql-parallel-restore.1 \
-	mysql-profile-compact.1 \
-	mysql-query-profiler.1 \
-	mysql-show-grants.1 \
-	mysql-slave-delay.1 \
-	mysql-slave-restart.1 \
-	mysql-table-checksum.1 \
-	mysql-table-sync.1 \
-	mysql-visual-explain.1
-MAN3=	mysqltoolkit.3
+MAN1=	mk-archiver.1 \
+		mk-checksum-filter.1 \
+		mk-deadlock-logger.1 \
+		mk-duplicate-key-checker.1 \
+		mk-find.1 \
+		mk-heartbeat.1 \
+		mk-parallel-dump.1 \
+		mk-parallel-restore.1 \
+		mk-profile-compact.1 \
+		mk-query-profiler.1 \
+		mk-show-grants.1 \
+		mk-slave-delay.1 \
+		mk-slave-restart.1 \
+		mk-table-checksum.1 \
+		mk-table-sync.1 \
+		mk-visual-explain.1
+MAN3=	maatkit.3
 
 .include <bsd.port.mk>
diff --git a/databases/maatkit/distinfo b/databases/maatkit/distinfo
index 2bc3b110c4ce..05792eb1c0e1 100644
--- a/databases/maatkit/distinfo
+++ b/databases/maatkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysqltoolkit-1053.tar.gz) = 29b856b782cf5ae86669fc3a531e3613
-SHA256 (mysqltoolkit-1053.tar.gz) = 76c76a6b7e332674a61aedb8789e840a5ed450f1ea3b4ec7e3f67559ff94a275
-SIZE (mysqltoolkit-1053.tar.gz) = 182288
+MD5 (maatkit-1674.tar.gz) = 6756df2f9f5158e6cdee627dbbebaf01
+SHA256 (maatkit-1674.tar.gz) = 656910ce441887306724febe5825521f5e927909abae2d84719c738656229b13
+SIZE (maatkit-1674.tar.gz) = 284613
diff --git a/databases/maatkit/pkg-descr b/databases/maatkit/pkg-descr
index 6b15607759fb..103203a86e0a 100644
--- a/databases/maatkit/pkg-descr
+++ b/databases/maatkit/pkg-descr
@@ -1,6 +1,5 @@
-mysqltoolkit is a collection of command-line utilities that provide missing
-functionality for MySQL. Some of the tools implement lacking server
-functionality, such as online consistency checks for master/slave replication;
-others are client-side utilities such as a query profiler.
+Maatkit is a collection of essential command-line utilities for MySQL.
+Each is completely stand-alone, without dependencies other than core Perl
+and the DBI drivers needed to connect to MySQL.
 
-WWW:	http://mysqltoolkit.sourceforge.net
+WWW:	http://maatkit.sourceforge.net
diff --git a/databases/maatkit/pkg-plist b/databases/maatkit/pkg-plist
index bef765eab3b8..c983d6b1e24e 100644
--- a/databases/maatkit/pkg-plist
+++ b/databases/maatkit/pkg-plist
@@ -1,19 +1,19 @@
-%%SITE_PERL%%/mysqltoolkit.pm
-bin/mysql-archiver
-bin/mysql-checksum-filter
-bin/mysql-deadlock-logger
-bin/mysql-duplicate-key-checker
-bin/mysql-find
-bin/mysql-heartbeat
-bin/mysql-parallel-dump
-bin/mysql-parallel-restore
-bin/mysql-profile-compact
-bin/mysql-query-profiler
-bin/mysql-show-grants
-bin/mysql-slave-delay
-bin/mysql-slave-restart
-bin/mysql-table-checksum
-bin/mysql-table-sync
-bin/mysql-visual-explain
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/mysqltoolkit/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mysqltoolkit
+%%SITE_PERL%%/maatkit.pm
+bin/mk-archiver
+bin/mk-checksum-filter
+bin/mk-deadlock-logger
+bin/mk-duplicate-key-checker
+bin/mk-find
+bin/mk-heartbeat
+bin/mk-parallel-dump
+bin/mk-parallel-restore
+bin/mk-profile-compact
+bin/mk-query-profiler
+bin/mk-show-grants
+bin/mk-slave-delay
+bin/mk-slave-restart
+bin/mk-table-checksum
+bin/mk-table-sync
+bin/mk-visual-explain
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/maatkit/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/maatkit