diff --git a/MOVED b/MOVED
index 3477c3ed9e51..7399451962db 100644
--- a/MOVED
+++ b/MOVED
@@ -8118,3 +8118,4 @@ www/fusionpbx||2016-01-25|Has expired: PHP 5.4 EOL reached
 www/jawstats||2016-01-25|Has expired: PHP 5.4 EOL reached
 www/ojs2||2016-01-25|Has expired: PHP 5.4 EOL reached
 www/webcalendar||2016-01-25|Has expired: PHP 5.4 EOL reached
+devel/py-msgpack|devel/py-msgpack-python|2015-01-28|Renamed to match upstream naming
diff --git a/archivers/py-attic/Makefile b/archivers/py-attic/Makefile
index 60011cc29e0e..a3270c6c75a4 100644
--- a/archivers/py-attic/Makefile
+++ b/archivers/py-attic/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Deduplicating backup program
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.10:${PORTSDIR}/devel/py-msgpack
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.10:${PORTSDIR}/devel/py-msgpack
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:${PORTSDIR}/devel/py-msgpack-python
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:${PORTSDIR}/devel/py-msgpack-python
 
 USES=		python:3.2+
 USE_PYTHON=	autoplist distutils
diff --git a/devel/Makefile b/devel/Makefile
index e0453ae25675..adaf7ee8e8d2 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4151,7 +4151,7 @@
     SUBDIR += py-monotonic
     SUBDIR += py-more-itertools
     SUBDIR += py-mox
-    SUBDIR += py-msgpack
+    SUBDIR += py-msgpack-python
     SUBDIR += py-multipledispatch
     SUBDIR += py-mwlib
     SUBDIR += py-mwlib.ext
diff --git a/devel/py-msgpack/Makefile b/devel/py-msgpack-python/Makefile
similarity index 72%
rename from devel/py-msgpack/Makefile
rename to devel/py-msgpack-python/Makefile
index aff11c7c7b4c..a414aa935713 100644
--- a/devel/py-msgpack/Makefile
+++ b/devel/py-msgpack-python/Makefile
@@ -1,17 +1,13 @@
 # Created by: Andrey Zonov <andrey@zonov.org>
 # $FreeBSD$
 
-PORTNAME=	msgpack
-PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTNAME=	msgpack-python
+PORTVERSION=	0.4.6
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-python-${PORTVERSION}
 
-# TODO: Rename to py-msgpack-python (upstream name)
-
-MAINTAINER=	zont@FreeBSD.org
+MAINTAINER=	brendan+freebsd@bbqsrc.net
 COMMENT=	MessagePack (de)serializer for Python
 
 LICENSE=	APACHE20
diff --git a/devel/py-msgpack-python/distinfo b/devel/py-msgpack-python/distinfo
new file mode 100644
index 000000000000..3df1db2b6948
--- /dev/null
+++ b/devel/py-msgpack-python/distinfo
@@ -0,0 +1,2 @@
+SHA256 (msgpack-python-0.4.6.tar.gz) = bfcc581c9dbbf07cc2f951baf30c3249a57e20dcbd60f7e6ffc43ab3cc614794
+SIZE (msgpack-python-0.4.6.tar.gz) = 116433
diff --git a/devel/py-msgpack/pkg-descr b/devel/py-msgpack-python/pkg-descr
similarity index 100%
rename from devel/py-msgpack/pkg-descr
rename to devel/py-msgpack-python/pkg-descr
diff --git a/devel/py-msgpack/distinfo b/devel/py-msgpack/distinfo
deleted file mode 100644
index a6599c2dc544..000000000000
--- a/devel/py-msgpack/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (msgpack-python-0.4.2.tar.gz) = 0476e8fdd79e5b648b349bd0edebf06e41271ee29421ef7adb12cdbe55dac2a9
-SIZE (msgpack-python-0.4.2.tar.gz) = 114043
diff --git a/devel/py-tarantool-queue/Makefile b/devel/py-tarantool-queue/Makefile
index 2ce1c5e6f767..982ba1ba6294 100644
--- a/devel/py-tarantool-queue/Makefile
+++ b/devel/py-tarantool-queue/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python bindings for Tarantool queue
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tarantool>=0:${PORTSDIR}/databases/py-tarantool \
-		${PYTHON_PKGNAMEPREFIX}msgpack>=0:${PORTSDIR}/devel/py-msgpack
+		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0:${PORTSDIR}/devel/py-msgpack-python
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index 5ef89d98b158..ff8ce010ace0 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.13:${PORTSDIR}/devel/py-msgpack \
+		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.13:${PORTSDIR}/devel/py-msgpack-python \
 		${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:${PORTSDIR}/net/py-libcloud \
 		${PYTHON_PKGNAMEPREFIX}botocore>0:${PORTSDIR}/devel/py-botocore \
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:${PORTSDIR}/textproc/py-MarkupSafe \
diff --git a/www/py-autobahn/Makefile b/www/py-autobahn/Makefile
index d4774510f279..a13843f784e4 100644
--- a/www/py-autobahn/Makefile
+++ b/www/py-autobahn/Makefile
@@ -44,7 +44,7 @@ TWISTED_DESC=		Twisted Backend (Python 2.x ONLY)
 ACCELERATE_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}wsaccel>=0.6.2:${PORTSDIR}/www/py-wsaccel \
 				${PYTHON_PKGNAMEPREFIX}ujson>=1.33:${PORTSDIR}/devel/py-ujson
 
-SERIALIZATION_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=0.4.0:${PORTSDIR}/devel/py-msgpack
+SERIALIZATION_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:${PORTSDIR}/devel/py-msgpack-python
 
 TWISTED_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6:${PORTSDIR}/devel/py-zope.interface \
 				${PYTHON_PKGNAMEPREFIX}twisted>=12.1:${PORTSDIR}/devel/py-twisted