diff --git a/audio/py-eyed3/Makefile b/audio/py-eyed3/Makefile
index 27b87469722..a823240df04 100644
--- a/audio/py-eyed3/Makefile
+++ b/audio/py-eyed3/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.12 2014/09/18 07:26:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2015/12/11 18:20:01 sthen Exp $
 
 COMMENT=		module and program for processing ID3 tags
 
-MODPY_EGG_VERSION=	0.6.18
+MODPY_EGG_VERSION=	0.7.9
 DISTNAME=		eyeD3-${MODPY_EGG_VERSION}
 CATEGORIES=		audio
 
@@ -14,13 +14,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 MASTER_SITES=		${HOMEPAGE}releases/
 
 MODULES=		lang/python
-MODPY_ADJ_FILES=	bin/eyeD3
 
-USE_GMAKE=		Yes
+MODPY_SETUPTOOLS=	Yes
+
 FAKE_FLAGS=		docdir=${WRKINST}${PREFIX}/share/doc/py-eyed3
 
-CONFIGURE_STYLE=	gnu
-
 NO_TEST=		Yes
 
+pre-build:
+	${SUBST_CMD} ${WRKSRC}/bin/eyeD3
+
 .include <bsd.port.mk>
diff --git a/audio/py-eyed3/distinfo b/audio/py-eyed3/distinfo
index f81fe45538c..4f49b96f8aa 100644
--- a/audio/py-eyed3/distinfo
+++ b/audio/py-eyed3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (eyeD3-0.6.18.tar.gz) = rYceJSRz8duBsldK46fT4UEo4o3gtUmYtM4dYtwgdAY=
-SIZE (eyeD3-0.6.18.tar.gz) = 117002
+SHA256 (eyeD3-0.7.9.tar.gz) = 9+eXOye0e27v1H76lJapqaOVe/Cg8ccIEW2YOR6GvyI=
+SIZE (eyeD3-0.7.9.tar.gz) = 230160
diff --git a/audio/py-eyed3/patches/patch-Makefile_in b/audio/py-eyed3/patches/patch-Makefile_in
deleted file mode 100644
index e121a2e49f4..00000000000
--- a/audio/py-eyed3/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2014/09/18 07:26:38 sthen Exp $
---- Makefile.in.orig	Fri Nov 25 04:37:44 2011
-+++ Makefile.in	Thu Sep 18 08:10:17 2014
-@@ -67,7 +67,6 @@ install:
- 
- 	install -m 755 -d ${mandir}/man1
- 	install -m 644 doc/eyeD3.1 ${mandir}/man1
--	gzip -f -9 ${mandir}/man1/eyeD3.1
- 
- 	@#
- 	@# NOTE:  When adding new files, the eyeD3.spec.in file and
diff --git a/audio/py-eyed3/patches/patch-bin_eyeD3 b/audio/py-eyed3/patches/patch-bin_eyeD3
new file mode 100644
index 00000000000..ab8eadb3b94
--- /dev/null
+++ b/audio/py-eyed3/patches/patch-bin_eyeD3
@@ -0,0 +1,9 @@
+$OpenBSD: patch-bin_eyeD3,v 1.1 2015/12/11 18:20:01 sthen Exp $
+--- bin/eyeD3.orig	Wed Oct 24 02:38:29 2012
++++ bin/eyeD3	Fri Dec 11 18:52:31 2015
+@@ -1,3 +1,3 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+-python -m eyed3.main "$@"
++exec ${MODPY_BIN} -m eyed3.main "$@"
diff --git a/audio/py-eyed3/patches/patch-configure b/audio/py-eyed3/patches/patch-configure
deleted file mode 100644
index ab8198c3223..00000000000
--- a/audio/py-eyed3/patches/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2014/09/18 07:26:38 sthen Exp $
---- configure.orig	Thu Sep 18 08:11:24 2014
-+++ configure	Thu Sep 18 08:12:06 2014
-@@ -1710,7 +1710,6 @@ fi
- 
- 
- 
--   PYTHON=""
-    for python in python python2 python2.5; do
-               unset ac_cv_path_PYTHON
-        for ac_prog in $python
diff --git a/audio/py-eyed3/pkg/PLIST b/audio/py-eyed3/pkg/PLIST
index 76d88b2f886..6d198a76300 100644
--- a/audio/py-eyed3/pkg/PLIST
+++ b/audio/py-eyed3/pkg/PLIST
@@ -1,22 +1,74 @@
-@comment $OpenBSD: PLIST,v 1.2 2014/09/18 07:26:38 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2015/12/11 18:20:01 sthen Exp $
 bin/eyeD3
-lib/python${MODPY_VERSION}/site-packages/eyeD3/
-lib/python${MODPY_VERSION}/site-packages/eyeD3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
-lib/python${MODPY_VERSION}/site-packages/eyeD3/__init__.py
-lib/python${MODPY_VERSION}/site-packages/eyeD3/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/eyeD3/binfuncs.py
-lib/python${MODPY_VERSION}/site-packages/eyeD3/binfuncs.pyc
-lib/python${MODPY_VERSION}/site-packages/eyeD3/frames.py
-lib/python${MODPY_VERSION}/site-packages/eyeD3/frames.pyc
-lib/python${MODPY_VERSION}/site-packages/eyeD3/mp3.py
-lib/python${MODPY_VERSION}/site-packages/eyeD3/mp3.pyc
-lib/python${MODPY_VERSION}/site-packages/eyeD3/tag.py
-lib/python${MODPY_VERSION}/site-packages/eyeD3/tag.pyc
-lib/python${MODPY_VERSION}/site-packages/eyeD3/utils.py
-lib/python${MODPY_VERSION}/site-packages/eyeD3/utils.pyc
-@man man/man1/eyeD3.1
-share/doc/${MODPY_PY_PREFIX}eyed3/
-@comment share/doc/${MODPY_PY_PREFIX}eyed3/AUTHORS
-@comment share/doc/${MODPY_PY_PREFIX}eyed3/COPYING.gz
-@comment share/doc/${MODPY_PY_PREFIX}eyed3/ChangeLog.gz
-share/doc/${MODPY_PY_PREFIX}eyed3/README
+lib/python${MODPY_VERSION}/site-packages/eyeD3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/eyeD3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/eyeD3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/eyeD3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/eyeD3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/eyeD3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/eyed3/
+lib/python${MODPY_VERSION}/site-packages/eyed3/__init__.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/compat.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/compat.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/core.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/core.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/__init__.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/apple.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/apple.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/frames.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/frames.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/headers.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/headers.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/tag.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/id3/tag.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/info.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/info.py.in
+lib/python${MODPY_VERSION}/site-packages/eyed3/info.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/main.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/main.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/
+lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/__init__.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/headers.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/headers.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/__init__.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/art.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/art.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/classic.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/classic.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/fixup.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/fixup.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/genres.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/genres.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/itunes.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/itunes.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/lameinfo.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/lameinfo.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/nfo.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/nfo.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/pymod.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/pymod.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/statistics.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/statistics.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/xep_118.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/xep_118.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/__init__.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/art.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/art.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/binfuncs.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/binfuncs.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/cli.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/cli.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/console.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/console.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/log.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/log.pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/prompt.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/utils/prompt.pyc