diff --git a/www/sams2/Makefile b/www/sams2/Makefile
index 0aa78a990f2e..c3b47a7e950d 100644
--- a/www/sams2/Makefile
+++ b/www/sams2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	sams2
 DISTVERSION=	2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://sams.perm.ru/download/ http://razumit.ru/
 
@@ -12,7 +12,7 @@ COMMENT=	Squid Accounting Management System
 LICENSE=	BSD4CLAUSE
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
-RUN_DEPENDS=	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
+RUN_DEPENDS=	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/${_MYSQL_SERVER}
 
 USES=		gmake libtool tar:bzip2
 USE_AUTOTOOLS=	aclocal libtoolize
@@ -21,7 +21,7 @@ USE_PHP=	gd mysql zlib
 USE_MYSQL=	yes
 
 GNU_CONFIGURE=	yes
-INSTALL_TARGET= install-strip
+INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS+=--datarootdir=${WWWDIR:H}
 MAKE_ARGS+=	docdir=${DOCSDIR}
 
diff --git a/www/sams2/pkg-plist b/www/sams2/pkg-plist
index efbb6817b0ce..c1eced2fa340 100644
--- a/www/sams2/pkg-plist
+++ b/www/sams2/pkg-plist
@@ -9,9 +9,11 @@ etc/rc.d/sams2
 lib/sams2/libfsusage.a
 lib/sams2/libfsusage.so
 lib/sams2/libfsusage.so.1
+lib/sams2/libfsusage.so.1.0.0
 lib/sams2/libloadavg.a
 lib/sams2/libloadavg.so
 lib/sams2/libloadavg.so.1
+lib/sams2/libloadavg.so.1.0.0
 %%WWWDIR%%/authclass.php
 %%WWWDIR%%/bin/diskspace
 %%WWWDIR%%/bin/freemem
@@ -439,23 +441,3 @@ lib/sams2/libloadavg.so.1
 %%WWWDIR%%/trangeclass.php
 %%WWWDIR%%/tray.php
 %%WWWDIR%%/userclass.php
-@dirrm lib/sams2
-@dirrm %%WWWDIR%%/backup
-@dirrm %%WWWDIR%%/bin
-@dirrm %%WWWDIR%%/data
-@dirrm %%WWWDIR%%/icon/classic
-@dirrm %%WWWDIR%%/icon
-@dirrm %%WWWDIR%%/lang
-@dirrm %%WWWDIR%%/lib
-@dirrm %%WWWDIR%%/menu
-@dirrm %%WWWDIR%%/plugins/configtray/buttons
-@dirrm %%WWWDIR%%/plugins/configtray
-@dirrm %%WWWDIR%%/plugins/squid/buttons
-@dirrm %%WWWDIR%%/plugins/squid/lang
-@dirrm %%WWWDIR%%/plugins/squid
-@dirrm %%WWWDIR%%/plugins/webconfig/buttons
-@dirrm %%WWWDIR%%/plugins/webconfig/lang
-@dirrm %%WWWDIR%%/plugins/webconfig
-@dirrm %%WWWDIR%%/plugins
-@dirrm %%WWWDIR%%/src
-@dirrm %%WWWDIR%%