diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile
index 7d6fe917b0da..b1d8c4499fd1 100644
--- a/devel/py-pip/Makefile
+++ b/devel/py-pip/Makefile
@@ -1,45 +1,47 @@
-# New ports collection makefile for:	pip
-# Date created:		2009-01-19
-# Whom:			Nicola Vitale <nivit@FreeBSD.org>
-#
+# Created by: Nicola Vitale <nivit@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	pip
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3.1
 PORTREVISION=	0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP \
 		LOCAL/nivit/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Pip installs (Python) packages. An easy_install replacement
 
 LICENSE=	MIT
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 REINPLACE_ARGS=	-i.bak -e "s/env python$$/&${PYTHON_VER}/"
 
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	DOCS
 
 PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
 
 # Python3 ready
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} ${WRKSRC}/pip/__init__.py
 
 .if ${PORT_OPTIONS:MDOCS}
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} >= 320
+.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc"
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/py-pip/distinfo b/devel/py-pip/distinfo
index 6f5391e1679f..2d11839d8839 100644
--- a/devel/py-pip/distinfo
+++ b/devel/py-pip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pip-1.2.1.tar.gz) = 12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1
-SIZE (pip-1.2.1.tar.gz) = 102413
+SHA256 (pip-1.3.1.tar.gz) = 145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957
+SIZE (pip-1.3.1.tar.gz) = 247594
diff --git a/devel/py-pip/pkg-plist b/devel/py-pip/pkg-plist
index 9afe1b99163b..ad7cb9d32f05 100644
--- a/devel/py-pip/pkg-plist
+++ b/devel/py-pip/pkg-plist
@@ -1,112 +1,130 @@
 @comment $FreeBSD$
 bin/pip
 bin/pip-%%PYTHON_VER%%
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/__main__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/__main__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/__main__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat/socket_create_connection.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat/socket_create_connection.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat/socket_create_connection.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat/ssl_match_hostname.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat/ssl_match_hostname.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat/ssl_match_hostname.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/basecommand.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/basecommand.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/basecommand.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/baseparser.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/baseparser.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/baseparser.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/cacert.pem
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/cmdoptions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/cmdoptions.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/cmdoptions.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/bundle.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/bundle.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/bundle.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/completion.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/completion.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/completion.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/freeze.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/freeze.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/freeze.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/help.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/help.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/help.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/install.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/install.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/install.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/list.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/list.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/list.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/search.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/search.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/search.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/show.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/show.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/show.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/uninstall.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/uninstall.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/uninstall.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/unzip.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/unzip.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/unzip.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/zip.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/zip.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/zip.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/download.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/download.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/download.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/exceptions.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/exceptions.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/exceptions.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/index.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/index.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/index.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/locations.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/locations.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/locations.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/log.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/log.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/log.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/req.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/req.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/req.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/runner.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/runner.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/runner.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/status_codes.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/status_codes.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/status_codes.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/util.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/util.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/util.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/bazaar.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/bazaar.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/bazaar.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/git.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/git.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/git.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/mercurial.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/mercurial.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/mercurial.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/subversion.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/subversion.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/subversion.pyo
-%%PORTDOCS%%%%DOCSDIR%%/ci-server-step-by-step.txt
 %%PORTDOCS%%%%DOCSDIR%%/configuration.txt
-%%PORTDOCS%%%%DOCSDIR%%/contributing.txt
-%%PORTDOCS%%%%DOCSDIR%%/glossary.txt
+%%PORTDOCS%%%%DOCSDIR%%/cookbook.txt
+%%PORTDOCS%%%%DOCSDIR%%/development.txt
 %%PORTDOCS%%%%DOCSDIR%%/index.txt
 %%PORTDOCS%%%%DOCSDIR%%/installing.txt
+%%PORTDOCS%%%%DOCSDIR%%/logic.txt
 %%PORTDOCS%%%%DOCSDIR%%/news.txt
 %%PORTDOCS%%%%DOCSDIR%%/other-tools.txt
-%%PORTDOCS%%%%DOCSDIR%%/requirements.txt
+%%PORTDOCS%%%%DOCSDIR%%/quickstart.txt
 %%PORTDOCS%%%%DOCSDIR%%/usage.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%