diff --git a/audio/emms/Makefile b/audio/emms/Makefile
index c509211eb260..643a6827422e 100644
--- a/audio/emms/Makefile
+++ b/audio/emms/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	emms
-PORTVERSION=	3.0
-PORTREVISION=	13
+PORTVERSION=	4.0
 CATEGORIES=	audio elisp
 MASTER_SITES=	GNU
 
@@ -14,8 +13,9 @@ LICENSE=	GPLv3
 
 USES=		gmake makeinfo
 USE_EMACS=	yes
-MAKE_ENV+=	EMMSPREFIX=${STAGEDIR}${PREFIX} LOCALBASE=${LOCALBASE} \
-		EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR}
+MAKE_ENV=	SITELISP="${PREFIX}/${EMACS_SITE_LISPDIR}/emms" \
+		INSTALLINFO="${TRUE}"
+
 INFO=		emms
 
 .include <bsd.port.pre.mk>
@@ -24,4 +24,17 @@ INFO=		emms
 PORTNAMESUFFIX=	${PKGNAMESUFFIX}
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|^\(DESTDIR\)=|\1?=| ; \
+		 s|^\(PREFIX\)=$$(DESTDIR)|\1?=| ; \
+		 s|^\(INFODIR\)=|\1?=| ; \
+		 s|^\(MAN1DIR\)=$$(PREFIX)/share|\1?=$$(PREFIX)| ; \
+		 s|^\(SITELISP\)=|\1?=| ; \
+		 s|^\(INSTALLINFO\) =|INSTALLINFO ?=| ; \
+		 s| \($$(SITELISP)\)| $$(DESTDIR)\1|g ; \
+		 s| \($$(INFODIR)\)| $$(DESTDIR)\1|g ; \
+		 s|\($$(INFODIR)\)/emms|\1| ; \
+		 s| \($$(MAN1DIR)\)| $$(DESTDIR)\1|g' ${WRKSRC}/Makefile
+
 .include <bsd.port.post.mk>
diff --git a/audio/emms/distinfo b/audio/emms/distinfo
index 5d6036cac022..8c402b3f9e94 100644
--- a/audio/emms/distinfo
+++ b/audio/emms/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emms-3.0.tar.gz) = 5b750312dc82f856b1c725c0d795216f430ef7c25a301cda75b4847e52773594
-SIZE (emms-3.0.tar.gz) = 200838
+SHA256 (emms-4.0.tar.gz) = f4a09bed31efd000be9de44bb54fe46056d9742255279a45547b21b5791c16e0
+SIZE (emms-4.0.tar.gz) = 279984
diff --git a/audio/emms/files/patch-Makefile b/audio/emms/files/patch-Makefile
deleted file mode 100644
index 20d0f5df0ab0..000000000000
--- a/audio/emms/files/patch-Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./Makefile.orig	2007-06-29 19:16:24.000000000 +0300
-+++ ./Makefile	2009-05-30 12:56:48.565749310 +0300
-@@ -1,4 +1,4 @@
--EMACS=emacs
-+EMACS=$(EMACS_NAME)-$(EMACS_VER)
- SITEFLAG=--no-site-file
- GZIP=gzip
- ALLSOURCE=$(wildcard *.el)
-@@ -8,13 +8,13 @@
- TARGET=$(patsubst %.el,%.elc,$(SOURCE))
- MAN1PAGES=emms-print-metadata.1
- 
--DESTDIR=
--PREFIX=$(DESTDIR)/usr/local
--INFODIR=$(PREFIX)/info
--MAN1DIR=$(PREFIX)/share/man/man1
--SITELISP=$(PREFIX)/share/emacs/site-lisp/emms
-+DESTDIR?=
-+EMMSPREFIX?=$(DESTDIR)/usr/local
-+INFODIR?=$(EMMSPREFIX)/info
-+MAN1DIR?=$(EMMSPREFIX)/man/man1
-+SITELISP?=$(EMMSPREFIX)/$(EMACS_SITE_LISPDIR)/emms
- 
--INSTALLINFO = /usr/sbin/install-info --info-dir=$(INFODIR)
-+INSTALLINFO?= /usr/bin/install-info --info-dir=$(INFODIR)
- 
- .PHONY: all install deb-install clean
- .PRECIOUS: %.elc %.info %.html
-@@ -48,7 +48,7 @@
- 	[ -d $(INFODIR) ] || install -d $(INFODIR)
- 	install -m 644 $(ALLSOURCE) $(SITELISP)
- 	install -m 644 $(ALLCOMPILED) $(SITELISP)
--	install -m 0644 emms.info $(INFODIR)/emms
-+	install -m 0644 emms.info $(INFODIR)
- 	for p in $(MAN1PAGES) ; do $(GZIP) -9c $$p > $(MAN1DIR)/$$p.gz ; done
- 	$(INSTALLINFO) emms.info
- 
diff --git a/audio/emms/pkg-plist b/audio/emms/pkg-plist
index 04dd73cd5162..358301771964 100644
--- a/audio/emms/pkg-plist
+++ b/audio/emms/pkg-plist
@@ -8,24 +8,28 @@ man/man1/emms-print-metadata.1.gz
 %%EMACS_SITE_LISPDIR%%/emms/emms-cache.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-compat.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-compat.elc
+%%EMACS_SITE_LISPDIR%%/emms/emms-cue.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-cue.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-history.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-history.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-i18n.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-i18n.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-info-libtag.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-info-libtag.elc
+%%EMACS_SITE_LISPDIR%%/emms/emms-info-metaflac.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-info-metaflac.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-info-mp3info.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-info-mp3info.elc
-%%EMACS_SITE_LISPDIR%%/emms/emms-info-ogg.el
-%%EMACS_SITE_LISPDIR%%/emms/emms-info-ogg.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-info-ogginfo.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-info-ogginfo.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-info.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-info.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-last-played.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-last-played.elc
-%%EMACS_SITE_LISPDIR%%/emms/emms-lastfm.el
-%%EMACS_SITE_LISPDIR%%/emms/emms-lastfm.elc
+%%EMACS_SITE_LISPDIR%%/emms/emms-librefm-scrobbler.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-librefm-scrobbler.elc
+%%EMACS_SITE_LISPDIR%%/emms/emms-librefm-stream.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-librefm-stream.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-lyrics.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-lyrics.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-maint.el
@@ -45,10 +49,14 @@ man/man1/emms-print-metadata.1.gz
 %%EMACS_SITE_LISPDIR%%/emms/emms-player-mplayer.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-player-simple.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-player-simple.elc
+%%EMACS_SITE_LISPDIR%%/emms/emms-player-vlc.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-player-vlc.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-player-xine.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-player-xine.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-playing-time.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-playing-time.elc
+%%EMACS_SITE_LISPDIR%%/emms/emms-playlist-limit.el
+%%EMACS_SITE_LISPDIR%%/emms/emms-playlist-limit.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-playlist-mode.el
 %%EMACS_SITE_LISPDIR%%/emms/emms-playlist-mode.elc
 %%EMACS_SITE_LISPDIR%%/emms/emms-playlist-sort.el
@@ -79,8 +87,6 @@ man/man1/emms-print-metadata.1.gz
 %%EMACS_SITE_LISPDIR%%/emms/jack.elc
 %%EMACS_SITE_LISPDIR%%/emms/later-do.el
 %%EMACS_SITE_LISPDIR%%/emms/later-do.elc
-%%EMACS_SITE_LISPDIR%%/emms/ogg-comment.el
-%%EMACS_SITE_LISPDIR%%/emms/ogg-comment.elc
 %%EMACS_SITE_LISPDIR%%/emms/tq.el
 %%EMACS_SITE_LISPDIR%%/emms/tq.elc
 @dirrm %%EMACS_SITE_LISPDIR%%/emms