diff --git a/MOVED b/MOVED
index f5fc142add02..d61dbb154ed1 100644
--- a/MOVED
+++ b/MOVED
@@ -8100,3 +8100,4 @@ devel/msp430-libc|devel/gcc-msp430-ti-toolchain|2016-01-08|Has expired: Obsolete
 devel/msp430-binutils|devel/gcc-msp430-ti-toolchain|2016-01-08|Has expired: Obsolete. Please, use devel/gcc-msp430-ti-toolchain
 devel/e_dbus||2016-01-15|Has expired: Not used anymore by x11-wm/enlightenment
 www/xpi-locale-switcher||2016-01-15|Has expired: incompatible with Firefox 34 (and later presumably)
+textproc/py-gettext|textproc/py-python-gettext|2016-01-16|Renamed to match upstream name
diff --git a/devel/py-Products.PlacelessTranslationService/Makefile b/devel/py-Products.PlacelessTranslationService/Makefile
index d68950c79140..e4412173ec0f 100644
--- a/devel/py-Products.PlacelessTranslationService/Makefile
+++ b/devel/py-Products.PlacelessTranslationService/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Products.PlacelessTranslationService
 PORTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Internationalizing and localizing software for Zope 2
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gettext>=0.6:${PORTSDIR}/textproc/py-gettext \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-gettext>0:${PORTSDIR}/textproc/py-python-gettext \
 		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
 		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
 		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:${PORTSDIR}/devel/py-zope.deferredimport \
diff --git a/textproc/Makefile b/textproc/Makefile
index 28051691b87d..ff8a40db45c4 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1227,7 +1227,6 @@
     SUBDIR += py-feedparser
     SUBDIR += py-genshi
     SUBDIR += py-genshi-devel
-    SUBDIR += py-gettext
     SUBDIR += py-hexdump
     SUBDIR += py-html2text
     SUBDIR += py-hyperestraier-python
@@ -1262,6 +1261,7 @@
     SUBDIR += py-pystemmer
     SUBDIR += py-python-augeas
     SUBDIR += py-python-docx
+    SUBDIR += py-python-gettext
     SUBDIR += py-pytidylib
     SUBDIR += py-pyx12
     SUBDIR += py-qrcode
diff --git a/textproc/py-gettext/Makefile b/textproc/py-python-gettext/Makefile
similarity index 88%
rename from textproc/py-gettext/Makefile
rename to textproc/py-python-gettext/Makefile
index 867fff425fd8..68c2e8b433f2 100644
--- a/textproc/py-gettext/Makefile
+++ b/textproc/py-python-gettext/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
-PORTNAME=	gettext
+PORTNAME=	python-gettext
 PORTVERSION=	2.1
 PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Python Gettext po to mo file compiler
diff --git a/textproc/py-gettext/distinfo b/textproc/py-python-gettext/distinfo
similarity index 100%
rename from textproc/py-gettext/distinfo
rename to textproc/py-python-gettext/distinfo
diff --git a/textproc/py-gettext/pkg-descr b/textproc/py-python-gettext/pkg-descr
similarity index 100%
rename from textproc/py-gettext/pkg-descr
rename to textproc/py-python-gettext/pkg-descr