diff --git a/sysutils/yum/Makefile b/sysutils/yum/Makefile
index c5b366809705..4d68c5233b07 100644
--- a/sysutils/yum/Makefile
+++ b/sysutils/yum/Makefile
@@ -9,6 +9,8 @@ MASTER_SITES=	http://yum.baseurl.org/download/${PORTVERSION:R}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Installer/updater for rpm
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		msgfmt:${PORTSDIR}/devel/gettext \
 		intltool-update:${PORTSDIR}/textproc/intltool
@@ -19,20 +21,13 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/rpm:${PORTSDIR}/archivers/rpm4 \
 		${PYTHON_SITELIBDIR}/urlgrabber:${PORTSDIR}/www/py-urlgrabber
 
 USE_PYTHON=	yes
-USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext gmake
 
 MAKE_ARGS=	MAKE=${GMAKE} PYTHON=${PYTHON_CMD} \
 		prefix=${PREFIX} mandir=${MANPREFIX}/man sysconfdir=${PREFIX}/etc
 
-PLIST_SUB+=	PYTHONPREFIX_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR}
-
-MAN5=		yum.conf.5 yum-updatesd.conf.5
-MAN8=		yum.8 yum-updatesd.8 yum-shell.8
-
 RPMDIR?=	/var/lib/rpm
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' -e \
 	's|@RPMDIR@|${RPMDIR}|g' -e \
@@ -83,20 +78,4 @@ post-patch:
 	${REINPLACE_CMD} -e 's|%%PYTHONPREFIX_SITELIBDIR%%|${PYTHONPREFIX_SITELIBDIR}|' \
 		${WRKSRC}/yum/Makefile ${WRKSRC}/rpmUtils/Makefile
 
-pre-install:
-	${MKDIR} ${PREFIX}/share/yum-cli
-	${MKDIR} ${PREFIX}/etc/yum/repos.d
-	${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/rpmUtils
-	${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/yum
-	${MKDIR} /var/cache/yum
-	${MKDIR} /var/lib/yum
-
-post-install:
-	if [ ! -f ${PREFIX}/etc/yum/yum.conf ]; then \
-		${CP} -p ${PREFIX}/etc/yum/yum.conf.sample ${PREFIX}/etc/yum/yum.conf; \
-	fi
-	if [ ! -f ${PREFIX}/etc/yum/yum-updatesd.conf ]; then \
-		${CP} -p ${PREFIX}/etc/yum/yum-updatesd.conf.sample ${PREFIX}/etc/yum/yum-updatesd.conf; \
-	fi
-
 .include <bsd.port.mk>
diff --git a/sysutils/yum/files/patch-po-Makefile b/sysutils/yum/files/patch-po-Makefile
index 51771158124d..8227997f8b11 100644
--- a/sysutils/yum/files/patch-po-Makefile
+++ b/sysutils/yum/files/patch-po-Makefile
@@ -1,5 +1,5 @@
---- po/Makefile.orig	2010-05-06 16:54:46.000000000 +0200
-+++ po/Makefile	2011-06-08 17:19:11.000000000 +0200
+--- ./po/Makefile.orig	2011-06-28 20:27:22.000000000 +0000
++++ ./po/Makefile	2013-12-13 14:18:45.000000000 +0000
 @@ -1,7 +1,9 @@
 +localedir = share/locale
 +
@@ -7,10 +7,30 @@
  INSTALL_PROGRAM= ${INSTALL}
  INSTALL_DATA= ${INSTALL} -m 644
 -INSTALLNLSDIR=$(DESTDIR)/usr/share/locale
-+INSTALLNLSDIR=$(DESTDIR)$(localedir)
++INSTALLNLSDIR=$(PREFIX)/$(localedir)
  top_srcdir = "."
  
  
+@@ -57,15 +59,15 @@
+ depend:
+ 
+ install:	all
+-	mkdir -p $(PREFIX)/$(INSTALLNLSDIR)
++	mkdir -p $(DESTDIR)/$(INSTALLNLSDIR)
+ 	for n in $(CATALOGS); do \
+ 	    l=`basename $$n .po`; \
+ 	    mo=$$l.mo; \
+ 	    if [ ! -f $$mo ]; then continue; fi; \
+-	    $(INSTALL) -m 755 -d $(PREFIX)/$(INSTALLNLSDIR)/$$l; \
+-	    $(INSTALL) -m 755 -d $(PREFIX)/$(INSTALLNLSDIR)/$$l/LC_MESSAGES; \
++	    $(INSTALL) -m 755 -d $(DESTDIR)$(INSTALLNLSDIR)/$$l; \
++	    $(INSTALL) -m 755 -d $(DESTDIR)$(INSTALLNLSDIR)/$$l/LC_MESSAGES; \
+ 	    $(INSTALL) -m 644 $$mo \
+-		$(PREFIX)/$(INSTALLNLSDIR)/$$l/LC_MESSAGES/$(NLSPACKAGE).mo; \
++		$(DESTDIR)$(INSTALLNLSDIR)/$$l/LC_MESSAGES/$(NLSPACKAGE).mo; \
+ 	done
+ 
+ %.mo: %.po
 @@ -77,4 +79,4 @@
  	msgfmt -c $$n; \
  	done
diff --git a/sysutils/yum/pkg-plist b/sysutils/yum/pkg-plist
index 3e348665d8ee..438811c8e8cd 100644
--- a/sysutils/yum/pkg-plist
+++ b/sysutils/yum/pkg-plist
@@ -1,4 +1,9 @@
 bin/yum
+man/man5/yum-updatesd.conf.5.gz
+man/man5/yum.conf.5.gz
+man/man8/yum-shell.8.gz
+man/man8/yum-updatesd.8.gz
+man/man8/yum.8.gz
 sbin/yum-updatesd
 share/yum-cli/callback.py
 share/yum-cli/callback.pyc
@@ -125,10 +130,12 @@ etc/rc.d/init.d/yum-updatesd
 etc/dbus-1/system.d/yum-updatesd.conf
 etc/bash_completion.d/yum.bash
 etc/yum/version-groups.conf
-etc/yum/yum.conf
-etc/yum/yum-updatesd.conf
+@unexec if cmp -s %D/etc/yum/yum.conf.sample %D/etc/yum/yum.conf; then rm -f %D/etc/yum/yum.conf; fi
 etc/yum/yum.conf.sample
+@exec if [ ! -f %D/etc/yum/yum.conf ]; then cp -p %D/%F %B/yum.conf; fi
+@unexec if cmp -s %D/etc/yum/yum-updatesd.conf.sample %D/etc/yum/yum-updatesd.conf; then rm -f %D/etc/yum/yum-updatesd.conf; fi
 etc/yum/yum-updatesd.conf.sample
+@exec if [ ! -f %D/etc/yum/yum-updatesd.conf ]; then cp -p %D/%F %B/yum-updatesd.conf; fi
 @dirrm share/yum-cli
 @dirrm etc/yum/repos.d
 @dirrm etc/yum/vars
@@ -147,9 +154,6 @@ etc/yum/yum-updatesd.conf.sample
 @dirrmtry share/locale/ur
 @dirrmtry etc/dbus-1/system.d
 @dirrmtry etc/dbus-1
-@unexec if cmp -s %D/etc/yum/yum.conf.sample %D/etc/yum/yum.conf; then rm -f %D/etc/yum/yum.conf; fi
-@exec if [ ! -f %D/etc/yum/yum.conf ]; then cp -p %D/%F %B/yum.conf; fi
-@unexec if cmp -s %D/etc/yum/yum-updatesd.conf.sample %D/etc/yum/yum-updatesd.conf; then rm -f %D/etc/yum/yum-updatesd.conf; fi
-@exec if [ ! -f %D/etc/yum-updatesd/yum.conf ]; then cp -p %D/%F %B/yum-updatesd.conf; fi
 @unexec rmdir /var/cache/yum 2>&1 >/dev/null || true
 @unexec rmdir /var/lib/yum 2>&1 >/dev/null || true
+@unexec rmdir /var/lib 2>&1 >/dev/null || true