diff --git a/sysutils/linrename/Makefile b/sysutils/linrename/Makefile
index 931e4cc6c858..0a050b8e66d6 100644
--- a/sysutils/linrename/Makefile
+++ b/sysutils/linrename/Makefile
@@ -1,43 +1,45 @@
 PORTNAME=	linrename
 PORTVERSION=	2.25.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
-#MASTER_SITES=	KERNEL_ORG/linux/utils/util-linux/v${PORTVERSION}
-MASTER_SITES=	http://ftp.ntu.edu.tw/ftp/linux/%SUBDIR%/ \
-		http://ftp.sunet.se/pub/Linux/kernel.org/linux/%SUBDIR%/ \
-		http://kernel.org/pub/linux/%SUBDIR%/
-MASTER_SITE_SUBDIR=	utils/util-linux/v${PORTVERSION:R}
+MASTER_SITES=	KERNEL_ORG/linux/utils/util-linux/v${PORTVERSION:R}
 DISTNAME=	util-linux-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rename multiple files using substitution
 WWW=		http://freecode.com/projects/util-linux/
 
-BUILD_WRKSRC=	${WRKSRC}/misc-utils
-INSTALL_WRKSRC=	${WRKSRC}/misc-utils
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+DEPRECATED=	FreeBSD port unmaintained, use misc/mmv instead
+EXPIRATION_DATE=2025-09-30
 
 USES=		tar:xz
 
 CPPFLAGS+=	-I../include \
 		-DHAVE_DIRFD -DHAVE_ERR_H -DHAVE_LANGINFO_H -DHAVE_LOCALE_H \
 		-DHAVE_NANOSLEEP -DHAVE_FSYNC \
 		-DHAVE_PROGRAM_INVOCATION_SHORT_NAME \
 		-Dprogram_invocation_short_name=\"${PROGNAME}\" \
 		-DPACKAGE_STRING=\"util-linux\ ${PORTVERSION}\"
 
+BUILD_WRKSRC=	${WRKSRC}/misc-utils
+INSTALL_WRKSRC=	${WRKSRC}/misc-utils
+
 PLIST_FILES=	bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz
 
 post-patch:
 	${LN} -sf rename.1 ${BUILD_WRKSRC}/${PORTNAME}.1
 	${REINPLACE_CMD} 's/rename(1)/${PORTNAME}(1)/' ${BUILD_WRKSRC}/rename.c
 
 do-build:
 	cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME} \
 		rename.c ${LDFLAGS}
 
 do-install:
 	cd ${INSTALL_WRKSRC} \
 		&& ${INSTALL_PROGRAM} ${PORTNAME} ${STAGEDIR}${PREFIX}/bin \
 		&& ${INSTALL_MAN} ${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/sysutils/linrename/files/patch-misc-utils__rename.1 b/sysutils/linrename/files/patch-misc-utils__rename.1
index e5cf9be39591..8103a5ad475c 100644
--- a/sysutils/linrename/files/patch-misc-utils__rename.1
+++ b/sysutils/linrename/files/patch-misc-utils__rename.1
@@ -1,45 +1,45 @@
---- misc-utils/rename.1.orig	2012-06-11 19:06:53.730196000 +0900
-+++ misc-utils/rename.1	2012-09-28 00:43:17.000000000 +0900
+--- misc-utils/rename.1.orig	2014-10-24 09:21:20 UTC
++++ misc-utils/rename.1
 @@ -3,12 +3,12 @@
  .\"
  .TH RENAME 1 "June 2011" "util-linux" "User Commands"
  .SH NAME
 -rename \- rename files
 +linrename \- rename files
  .SH SYNOPSIS
 -.B rename
 +.B linrename
  .RI [ options ] " expression replacement file" ...
  .SH DESCRIPTION
 -.B rename
 +.B linrename
  will rename the specified files by replacing the first occurrence of
  .I expression
  in their name by
-@@ -30,8 +30,8 @@
+@@ -33,8 +33,8 @@ the commands
  .RS
  .PP
  .nf
 -rename foo foo0 foo?
 -rename foo foo0 foo??
 +linrename foo foo0 foo?
 +linrename foo foo0 foo??
  .fi
  .PP
  .RE
-@@ -41,7 +41,7 @@
+@@ -44,7 +44,7 @@ And
  .RS
  .PP
  .nf
 -rename .htm .html *.htm
 +linrename .htm .html *.htm
  .fi
  .PP
  .RE
-@@ -56,5 +56,5 @@
- .BR mmv (1),
+@@ -58,5 +58,5 @@ know what you are doing.
+ .SH "SEE ALSO"
  .BR mv (1)
  .SH AVAILABILITY
 -The rename command is part of the util-linux package and is available from
 +The linrename command is part of the util-linux package and is available from
  ftp://ftp.kernel.org/pub/linux/utils/util-linux/.