129 files changed, 129 insertions, 129 deletions

diff --git a/www/butterfly/pkg-descr b/www/butterfly/pkg-descr
index a8b36d491650..24ef790f8745 100644
--- a/www/butterfly/pkg-descr
+++ b/www/butterfly/pkg-descr
@@ -14,4 +14,4 @@ Features
 * Geolocation from browser
 * May work on firefox too
 
-WWW: https://pypi.python.org/pypi/butterfly
+WWW: https://pypi.org/project/butterfly/
diff --git a/www/py-Products.PloneLDAP/pkg-descr b/www/py-Products.PloneLDAP/pkg-descr
index 88bdc032113c..c8f6bdb2d549 100644
--- a/www/py-Products.PloneLDAP/pkg-descr
+++ b/www/py-Products.PloneLDAP/pkg-descr
@@ -1,3 +1,3 @@
 LDAP/Active Directory support for Plone
 
-WWW: https://pypi.python.org/pypi/Products.PloneLDAP
+WWW: https://pypi.org/project/Products.PloneLDAP/
diff --git a/www/py-WebError/pkg-descr b/www/py-WebError/pkg-descr
index 20a529915b1c..b7cef23b81e4 100644
--- a/www/py-WebError/pkg-descr
+++ b/www/py-WebError/pkg-descr
@@ -1,4 +1,4 @@
 py-WebError is a python module for web error handling and
 exception catching.
 
-WWW: https://pypi.python.org/pypi/WebError
+WWW: https://pypi.org/project/WebError/
diff --git a/www/py-azure-common/pkg-descr b/www/py-azure-common/pkg-descr
index 826eda033c5a..1b3811fa85ec 100644
--- a/www/py-azure-common/pkg-descr
+++ b/www/py-azure-common/pkg-descr
@@ -1,4 +1,4 @@
 Microsoft Azure Storage SDK for Python provides shared code by the Azure
 packages.
 
-WWW: https://pypi.python.org/pypi/azure-common
+WWW: https://pypi.org/project/azure-common/
diff --git a/www/py-azure-storage/pkg-descr b/www/py-azure-storage/pkg-descr
index 69a14ec3cb9a..a99df17481c9 100644
--- a/www/py-azure-storage/pkg-descr
+++ b/www/py-azure-storage/pkg-descr
@@ -1,4 +1,4 @@
 Microsoft Azure Storage SDK for Python provides a client library in Python
 that makes it easy to consume Microsoft Azure Storage services.
 
-WWW: https://pypi.python.org/pypi/azure-storage
+WWW: https://pypi.org/project/azure-storage/
diff --git a/www/py-collective.easytemplate/pkg-descr b/www/py-collective.easytemplate/pkg-descr
index f21e5da9f06a..6eab545ca736 100644
--- a/www/py-collective.easytemplate/pkg-descr
+++ b/www/py-collective.easytemplate/pkg-descr
@@ -1,3 +1,3 @@
 collective.easytemplate addon for Plone.
 
-WWW: https://pypi.python.org/pypi/collective.easytemplate
+WWW: https://pypi.org/project/collective.easytemplate/
diff --git a/www/py-collective.templateengines/pkg-descr b/www/py-collective.templateengines/pkg-descr
index 29f6f36d3add..e20ab770b240 100644
--- a/www/py-collective.templateengines/pkg-descr
+++ b/www/py-collective.templateengines/pkg-descr
@@ -2,4 +2,4 @@ collective.templateengines is an template engine abstraction layer for Python.
 It defines generic Zope interfaces for communicating with various Python
 template engines to achieve higher code reuse value.
 
-WWW: https://pypi.python.org/pypi/collective.templateengines
+WWW: https://pypi.org/project/collective.templateengines/
diff --git a/www/py-cssmin/pkg-descr b/www/py-cssmin/pkg-descr
index 1221e01f6512..b7ff5450cbaa 100644
--- a/www/py-cssmin/pkg-descr
+++ b/www/py-cssmin/pkg-descr
@@ -1,4 +1,4 @@
 This is a Python port of the YUI CSS Compressor.
 
-WWW: https://pypi.python.org/pypi/cssmin
+WWW: https://pypi.org/project/cssmin/
 WWW: https://github.com/zacharyvoase/cssmin
diff --git a/www/py-cssutils/pkg-descr b/www/py-cssutils/pkg-descr
index c1df2c5bb537..d4a66be27e70 100644
--- a/www/py-cssutils/pkg-descr
+++ b/www/py-cssutils/pkg-descr
@@ -2,5 +2,5 @@ A Python package to parse and build CSS Cascading Style Sheets. Partly implement
 the DOM Level 2 CSS interfaces. Additional some cssutils only convenience and
 (hopefully) more pythonic methods are integrated.
 
-WWW: https://pypi.python.org/pypi/cssutils
+WWW: https://pypi.org/project/cssutils/
 WWW: http://cthedot.de/cssutils/
diff --git a/www/py-django-babel/pkg-descr b/www/py-django-babel/pkg-descr
index 23a556ab1d6e..cf146e3b0df0 100644
--- a/www/py-django-babel/pkg-descr
+++ b/www/py-django-babel/pkg-descr
@@ -1,3 +1,3 @@
 Utilities for using Babel in Django
 
-WWW: https://pypi.python.org/pypi/django-babel
+WWW: https://pypi.org/project/django-babel/
diff --git a/www/py-django-bootstrap-form/pkg-descr b/www/py-django-bootstrap-form/pkg-descr
index 7ed666afc10d..44928134b063 100644
--- a/www/py-django-bootstrap-form/pkg-descr
+++ b/www/py-django-bootstrap-form/pkg-descr
@@ -3,4 +3,4 @@ Generate twitter-bootstrap form output for django form
 A simple Django template tag to work with twitter bootstrap (
 http://twitter.github.com/bootstrap/ )
 
-WWW: https://pypi.python.org/pypi/django-bootstrap-form
+WWW: https://pypi.org/project/django-bootstrap-form/
diff --git a/www/py-django-braces/pkg-descr b/www/py-django-braces/pkg-descr
index c6ac1fc6bb34..904d9f787e97 100644
--- a/www/py-django-braces/pkg-descr
+++ b/www/py-django-braces/pkg-descr
@@ -1,4 +1,4 @@
 django-braces provides mixins for Django's class-based views.
 
-WWW: https://pypi.python.org/pypi/django-braces
+WWW: https://pypi.org/project/django-braces/
 WWW: https://github.com/brack3t/django-braces
diff --git a/www/py-django-countries/pkg-descr b/www/py-django-countries/pkg-descr
index 2954ac53157d..66e3396968af 100644
--- a/www/py-django-countries/pkg-descr
+++ b/www/py-django-countries/pkg-descr
@@ -1,4 +1,4 @@
 A Django application that provides country choices for use with
 forms, flag icons static files, and a country field for models.
 
-WWW: https://pypi.python.org/pypi/django-countries
+WWW: https://pypi.org/project/django-countries/
diff --git a/www/py-django-crispy-forms/pkg-descr b/www/py-django-crispy-forms/pkg-descr
index f7206448010a..602f23e03e88 100644
--- a/www/py-django-crispy-forms/pkg-descr
+++ b/www/py-django-crispy-forms/pkg-descr
@@ -11,5 +11,5 @@ The application mainly provides:
   and specific layout setup. This gives you amazing power without much hassle,
   helping you save tons of time.
 
-WWW: https://pypi.python.org/pypi/django-crispy-forms
+WWW: https://pypi.org/project/django-crispy-forms/
 WWW: https://github.com/django-crispy-forms/django-crispy-forms
diff --git a/www/py-django-datetime-widget/pkg-descr b/www/py-django-datetime-widget/pkg-descr
index a98e8c3024e3..461558d1fc5a 100644
--- a/www/py-django-datetime-widget/pkg-descr
+++ b/www/py-django-datetime-widget/pkg-descr
@@ -1,4 +1,4 @@
 Django-datetime-widget is a simple and clean widget for DateTimeField.
 It's based on bootstrap-datepicker by Stefan Petre.
 
-WWW: https://pypi.python.org/pypi/django-datetime-widget
+WWW: https://pypi.org/project/django-datetime-widget/
diff --git a/www/py-django-debug-toolbar/pkg-descr b/www/py-django-debug-toolbar/pkg-descr
index b2bc31c751e1..ccf4f00e844e 100644
--- a/www/py-django-debug-toolbar/pkg-descr
+++ b/www/py-django-debug-toolbar/pkg-descr
@@ -2,5 +2,5 @@ The Django Debug Toolbar is a configurable set of panels that display various
 debug information about the current request/response and when clicked, display
 more details about the panel's content.
 
-WWW: https://pypi.python.org/pypi/django-debug-toolbar
+WWW: https://pypi.org/project/django-debug-toolbar/
 WWW: https://github.com/jazzband/django-debug-toolbar
diff --git a/www/py-django-filer/pkg-descr b/www/py-django-filer/pkg-descr
index 8b8ca19e5207..52ab27f6f6d5 100644
--- a/www/py-django-filer/pkg-descr
+++ b/www/py-django-filer/pkg-descr
@@ -1,5 +1,5 @@
 django-filer is a file management application for django.  It handles
 uploading and organizing files and images in contrib.admin.
 
-WWW: https://pypi.python.org/pypi/django-filer
+WWW: https://pypi.org/project/django-filer/
 WWW: https://github.com/stefanfoulis/django-filer
diff --git a/www/py-django-guardian/pkg-descr b/www/py-django-guardian/pkg-descr
index 4f48c4114fc7..fd6c335644c1 100644
--- a/www/py-django-guardian/pkg-descr
+++ b/www/py-django-guardian/pkg-descr
@@ -1,4 +1,4 @@
 django-guardian is an implementation of object permissions for Django
 providing extra authentication backend.
 
-WWW: https://pypi.python.org/pypi/django-guardian
+WWW: https://pypi.org/project/django-guardian/
diff --git a/www/py-django-htmlmin/pkg-descr b/www/py-django-htmlmin/pkg-descr
index 18b64c44c80b..d571e6e88d3d 100644
--- a/www/py-django-htmlmin/pkg-descr
+++ b/www/py-django-htmlmin/pkg-descr
@@ -3,4 +3,4 @@ It supports Django, Flask and many other Python web frameworks.  It also
 provides a command line tool, that can be used for static websites or
 deployment scripts.
 
-WWW: https://pypi.python.org/pypi/django-htmlmin
+WWW: https://pypi.org/project/django-htmlmin/
diff --git a/www/py-django-markwhat/pkg-descr b/www/py-django-markwhat/pkg-descr
index 381f5a954f52..15aaed20aa4c 100644
--- a/www/py-django-markwhat/pkg-descr
+++ b/www/py-django-markwhat/pkg-descr
@@ -14,4 +14,4 @@ returns a string representing the marked-up text. For example, the
 ``textile`` filter converts text that is marked-up in Textile format
 to HTML.
 
-WWW: https://pypi.python.org/pypi/django-markwhat
+WWW: https://pypi.org/project/django-markwhat/
diff --git a/www/py-django-model-utils/pkg-descr b/www/py-django-model-utils/pkg-descr
index c24080a2358b..634e12d10f40 100644
--- a/www/py-django-model-utils/pkg-descr
+++ b/www/py-django-model-utils/pkg-descr
@@ -1,5 +1,5 @@
 django-model-utils provides Django model mixins and utilities and supports
 Django 1.8 to 2.0.
 
-WWW: https://pypi.python.org/pypi/django-model-utils
+WWW: https://pypi.org/project/django-model-utils/
 WWW: https://github.com/jazzband/django-model-utils
diff --git a/www/py-django-otp-yubikey/pkg-descr b/www/py-django-otp-yubikey/pkg-descr
index dc72cfb1ff7d..87dcacaa6be1 100644
--- a/www/py-django-otp-yubikey/pkg-descr
+++ b/www/py-django-otp-yubikey/pkg-descr
@@ -2,4 +2,4 @@ This is a django-otp plugin that handles YubiKey devices using the Yubico OTP
 algorithm. This includes two device definitions: one to verify YubiKey tokens
 locally and another to verify them against a web service.
 
-WWW: https://pypi.python.org/pypi/django-otp-yubikey
+WWW: https://pypi.org/project/django-otp-yubikey/
diff --git a/www/py-django-picklefield/pkg-descr b/www/py-django-picklefield/pkg-descr
index cdaa811316ca..4472fae297fa 100644
--- a/www/py-django-picklefield/pkg-descr
+++ b/www/py-django-picklefield/pkg-descr
@@ -5,5 +5,5 @@ It is incredibly useful for storing just about anything in the database
 (provided it is Pickle-able, of course) when there isn't a 'proper' field for
 the job.
 
-WWW: https://pypi.python.org/pypi/django-picklefield
+WWW: https://pypi.org/project/django-picklefield/
 WWW: https://github.com/gintas/django-picklefield
diff --git a/www/py-django-pyscss/pkg-descr b/www/py-django-pyscss/pkg-descr
index f6509fd04f27..0e27e39c953d 100644
--- a/www/py-django-pyscss/pkg-descr
+++ b/www/py-django-pyscss/pkg-descr
@@ -1,3 +1,3 @@
 Makes it easier to use PySCSS in Django.
 
-WWW: https://pypi.python.org/pypi/django-pyscss
+WWW: https://pypi.org/project/django-pyscss/
diff --git a/www/py-django-reversion/pkg-descr b/www/py-django-reversion/pkg-descr
index ca32fe5a9da8..6bee58724820 100644
--- a/www/py-django-reversion/pkg-descr
+++ b/www/py-django-reversion/pkg-descr
@@ -14,4 +14,4 @@ provides comprehensive version control facilities:
 django-reversion can be easily added to your existing Django project
 with an absolute minimum of code changes.
 
-WWW: https://pypi.python.org/pypi/django-reversion
+WWW: https://pypi.org/project/django-reversion/
diff --git a/www/py-django-signals-ahoy/pkg-descr b/www/py-django-signals-ahoy/pkg-descr
index 2ca02932c6f0..98c3ca5daea6 100644
--- a/www/py-django-signals-ahoy/pkg-descr
+++ b/www/py-django-signals-ahoy/pkg-descr
@@ -1,3 +1,3 @@
 Provides an extended set of signals for use by Django apps.
 
-WWW: https://pypi.python.org/pypi/django-signals-ahoy
+WWW: https://pypi.org/project/django-signals-ahoy/
diff --git a/www/py-django-simple-captcha/pkg-descr b/www/py-django-simple-captcha/pkg-descr
index efe265dd8760..50d2bf8c5d71 100644
--- a/www/py-django-simple-captcha/pkg-descr
+++ b/www/py-django-simple-captcha/pkg-descr
@@ -1,4 +1,4 @@
 Django Simple Captcha is an extremely simple, yet highly customizable Django
 application to add captcha images to any Django form.
 
-WWW: https://pypi.python.org/pypi/django-simple-captcha
+WWW: https://pypi.org/project/django-simple-captcha/
diff --git a/www/py-django_openstack_auth/pkg-descr b/www/py-django_openstack_auth/pkg-descr
index 0d0b609ed052..af7b9784d518 100644
--- a/www/py-django_openstack_auth/pkg-descr
+++ b/www/py-django_openstack_auth/pkg-descr
@@ -1,3 +1,3 @@
 Django authentication backend for use with OpenStack Identity
 
-WWW: https://pypi.python.org/pypi/django_openstack_auth
+WWW: https://pypi.org/project/django_openstack_auth/
diff --git a/www/py-flask-compress/pkg-descr b/www/py-flask-compress/pkg-descr
index 83a8aeddd676..3d38a6302c8b 100644
--- a/www/py-flask-compress/pkg-descr
+++ b/www/py-flask-compress/pkg-descr
@@ -6,4 +6,4 @@ Internally, every time a request is made the extension will check if
 it matches one of the compressible MIME types and will automatically
 attach the appropriate headers.
 
-WWW: https://pypi.python.org/pypi/Flask-Compress
+WWW: https://pypi.org/project/Flask-Compress/
diff --git a/www/py-flask-uploads/pkg-descr b/www/py-flask-uploads/pkg-descr
index 9a1f57835c1e..5346d7df2de4 100644
--- a/www/py-flask-uploads/pkg-descr
+++ b/www/py-flask-uploads/pkg-descr
@@ -1,4 +1,4 @@
 Flask-Uploads allows your application to flexibly and efficiently handle file
 uploading and serving the uploaded files.
 
-WWW: https://pypi.python.org/pypi/Flask-Uploads
+WWW: https://pypi.org/project/Flask-Uploads/
diff --git a/www/py-google-api-core/pkg-descr b/www/py-google-api-core/pkg-descr
index 9d4c16fb51e6..f8b585773e23 100644
--- a/www/py-google-api-core/pkg-descr
+++ b/www/py-google-api-core/pkg-descr
@@ -3,5 +3,5 @@ Core Library for Google Client Libraries
 This library is not meant to stand-alone. Instead it defines common helpers used
 by all Google API clients.
 
-WWW: https://pypi.python.org/pypi/google-api-core
+WWW: https://pypi.org/project/google-api-core/
 WWW: https://github.com/GoogleCloudPlatform/google-cloud-python
diff --git a/www/py-google-cloud-core/pkg-descr b/www/py-google-cloud-core/pkg-descr
index 2c83389dd9f0..17a8a99eb032 100644
--- a/www/py-google-cloud-core/pkg-descr
+++ b/www/py-google-cloud-core/pkg-descr
@@ -1,4 +1,4 @@
 This library is not meant to stand-alone. Instead it defines common helpers
 (e.g. base Client classes) used by all of the google-cloud-* packages.
 
-WWW: https://pypi.python.org/pypi/google-cloud-core
+WWW: https://pypi.org/project/google-cloud-core/
diff --git a/www/py-google-cloud-storage/pkg-descr b/www/py-google-cloud-storage/pkg-descr
index 2b54b8daeb4b..29fd1c4b24e2 100644
--- a/www/py-google-cloud-storage/pkg-descr
+++ b/www/py-google-cloud-storage/pkg-descr
@@ -2,4 +2,4 @@ Google Cloud Storage allows you to store data on Google infrastructure with
 very high reliability, performance and availability, and can be used to
 distribute large data objects to users via direct download.
 
-WWW: https://pypi.python.org/pypi/google-cloud-storage
+WWW: https://pypi.org/project/google-cloud-storage/
diff --git a/www/py-google-resumable-media/pkg-descr b/www/py-google-resumable-media/pkg-descr
index aec9a882452f..d0826448ab1a 100644
--- a/www/py-google-resumable-media/pkg-descr
+++ b/www/py-google-resumable-media/pkg-descr
@@ -3,4 +3,4 @@ Utilities for Google Media Downloads and Resumable Uploads.
 This package has some general purposes modules, e.g. common, but the majority
 of the public interface will be contained in subpackages.
 
-WWW: https://pypi.python.org/pypi/google-resumable-media
+WWW: https://pypi.org/project/google-resumable-media/
diff --git a/www/py-html/pkg-descr b/www/py-html/pkg-descr
index 58dd4a272a34..202c68b505ee 100644
--- a/www/py-html/pkg-descr
+++ b/www/py-html/pkg-descr
@@ -1,3 +1,3 @@
 Simple, elegant HTML, XHTML and XML generation.
 
-WWW: https://pypi.python.org/pypi/html
+WWW: https://pypi.org/project/html/
diff --git a/www/py-hyperlink/pkg-descr b/www/py-hyperlink/pkg-descr
index e78e868d0710..29378b8497b6 100644
--- a/www/py-hyperlink/pkg-descr
+++ b/www/py-hyperlink/pkg-descr
@@ -1,5 +1,5 @@
 Hyperlink provides a pure-Python implementation of immutable URLs. Based on RFC
 3986 and 3987, the Hyperlink URL makes working with both URIs and IRIs easy.
 
-WWW: https://pypi.python.org/pypi/hyperlink
+WWW: https://pypi.org/project/hyperlink/
 WWW: https://github.com/python-hyper/hyperlink
diff --git a/www/py-libsass/pkg-descr b/www/py-libsass/pkg-descr
index d7dc2ca89db2..b58fc008f7cf 100644
--- a/www/py-libsass/pkg-descr
+++ b/www/py-libsass/pkg-descr
@@ -1,4 +1,4 @@
 A simple Python extension module sass which is binding Libsass
 (written in C/C++ by Hampton Catlin and Aaron Leung).
 
-WWW: https://pypi.python.org/pypi/libsass
+WWW: https://pypi.org/project/libsass/
diff --git a/www/py-nevow/pkg-descr b/www/py-nevow/pkg-descr
index 9ad9f1003bd2..1882b15194c7 100644
--- a/www/py-nevow/pkg-descr
+++ b/www/py-nevow/pkg-descr
@@ -12,4 +12,4 @@ error pages if appropriate. Once a form post has validated successfully, the
 method will be called with the coerced values.
 
 WWW: https://github.com/twisted/nevow
-WWW: https://pypi.python.org/pypi/Nevow
+WWW: https://pypi.org/project/Nevow/
diff --git a/www/py-pastescript/pkg-descr b/www/py-pastescript/pkg-descr
index 1cc40b3348e4..837c6353574b 100644
--- a/www/py-pastescript/pkg-descr
+++ b/www/py-pastescript/pkg-descr
@@ -12,5 +12,5 @@ It includes some built-in features;
 * Serving up web applications, with configuration based on
   paste.deploy.
 
-WWW: https://pypi.python.org/pypi/pastescript
+WWW: https://pypi.org/project/PasteScript/
 WWW: http://pythonpaste.org/script/
diff --git a/www/py-planet/pkg-descr b/www/py-planet/pkg-descr
index d8f9e0b646b7..d4aa0db8688a 100644
--- a/www/py-planet/pkg-descr
+++ b/www/py-planet/pkg-descr
@@ -4,4 +4,4 @@ access to Planet's public API easy to use.
 The command line interface is intended to be functional for many tasks but is
 just a thin layer on the lower level Python API.
 
-WWW: https://pypi.python.org/pypi/planet
+WWW: https://pypi.org/project/planet/
diff --git a/www/py-plone.alterego/pkg-descr b/www/py-plone.alterego/pkg-descr
index b87a6deaf91d..7a6459aa93e6 100644
--- a/www/py-plone.alterego/pkg-descr
+++ b/www/py-plone.alterego/pkg-descr
@@ -1,4 +1,4 @@
 This package defines a dynamic module type that lets you create objects in the
 dynamic module on demand.
 
-WWW: https://pypi.python.org/pypi/plone.alterego
+WWW: https://pypi.org/project/plone.alterego/
diff --git a/www/py-plone.app.blob/pkg-descr b/www/py-plone.app.blob/pkg-descr
index ca707ada40e3..c4e91e6d153f 100644
--- a/www/py-plone.app.blob/pkg-descr
+++ b/www/py-plone.app.blob/pkg-descr
@@ -1,3 +1,3 @@
 ZODB blob support for Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.blob
+WWW: https://pypi.org/project/plone.app.blob/
diff --git a/www/py-plone.app.caching/pkg-descr b/www/py-plone.app.caching/pkg-descr
index 75a1b8386860..2c493ba4b651 100644
--- a/www/py-plone.app.caching/pkg-descr
+++ b/www/py-plone.app.caching/pkg-descr
@@ -1,3 +1,3 @@
 Plone UI and default rules for plone.caching/z3c.caching.
 
-WWW: https://pypi.python.org/pypi/plone.app.caching
+WWW: https://pypi.org/project/plone.app.caching/
diff --git a/www/py-plone.app.collection/pkg-descr b/www/py-plone.app.collection/pkg-descr
index 9aea9368568d..ce41904d1228 100644
--- a/www/py-plone.app.collection/pkg-descr
+++ b/www/py-plone.app.collection/pkg-descr
@@ -1,4 +1,4 @@
 Collections in Plone are the most powerful tool content editors and site
 managers have to construct navigation and site sections.
 
-WWW: https://pypi.python.org/pypi/plone.app.collection
+WWW: https://pypi.org/project/plone.app.collection/
diff --git a/www/py-plone.app.content/pkg-descr b/www/py-plone.app.content/pkg-descr
index 70c20e897e22..f2831a4eb92a 100644
--- a/www/py-plone.app.content/pkg-descr
+++ b/www/py-plone.app.content/pkg-descr
@@ -1,3 +1,3 @@
 Content Views for Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.content
+WWW: https://pypi.org/project/plone.app.content/
diff --git a/www/py-plone.app.contentlisting/pkg-descr b/www/py-plone.app.contentlisting/pkg-descr
index 239f687a4126..ab63a65eacf8 100644
--- a/www/py-plone.app.contentlisting/pkg-descr
+++ b/www/py-plone.app.contentlisting/pkg-descr
@@ -1,3 +1,3 @@
 Listing of content for the Plone CMS.
 
-WWW: https://pypi.python.org/pypi/plone.app.contentlisting
+WWW: https://pypi.org/project/plone.app.contentlisting/
diff --git a/www/py-plone.app.contentmenu/pkg-descr b/www/py-plone.app.contentmenu/pkg-descr
index 23dc6bada518..837e25adb4b2 100644
--- a/www/py-plone.app.contentmenu/pkg-descr
+++ b/www/py-plone.app.contentmenu/pkg-descr
@@ -1,3 +1,3 @@
 Plone's content menu implementation.
 
-WWW: https://pypi.python.org/pypi/plone.app.contentmenu
+WWW: https://pypi.org/project/plone.app.contentmenu/
diff --git a/www/py-plone.app.contentrules/pkg-descr b/www/py-plone.app.contentrules/pkg-descr
index f6b8900be594..fd7ef7557288 100644
--- a/www/py-plone.app.contentrules/pkg-descr
+++ b/www/py-plone.app.contentrules/pkg-descr
@@ -1,3 +1,3 @@
 Plone integration for plone.contentrules.
 
-WWW: https://pypi.python.org/pypi/plone.app.contentrules
+WWW: https://pypi.org/project/plone.app.contentrules/
diff --git a/www/py-plone.app.controlpanel/pkg-descr b/www/py-plone.app.controlpanel/pkg-descr
index 9bcd9fe1f223..3954aca18d2c 100644
--- a/www/py-plone.app.controlpanel/pkg-descr
+++ b/www/py-plone.app.controlpanel/pkg-descr
@@ -1,3 +1,3 @@
 Formlib-based controlpanels for Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.controlpanel
+WWW: https://pypi.org/project/plone.app.controlpanel/
diff --git a/www/py-plone.app.customerize/pkg-descr b/www/py-plone.app.customerize/pkg-descr
index ac9205bf1be9..5dcfa03e1a6d 100644
--- a/www/py-plone.app.customerize/pkg-descr
+++ b/www/py-plone.app.customerize/pkg-descr
@@ -1,3 +1,3 @@
 Integrate five.customerize into Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.customerize
+WWW: https://pypi.org/project/plone.app.customerize/
diff --git a/www/py-plone.app.discussion/pkg-descr b/www/py-plone.app.discussion/pkg-descr
index 01ce4f9c0cd8..5799ee548f81 100644
--- a/www/py-plone.app.discussion/pkg-descr
+++ b/www/py-plone.app.discussion/pkg-descr
@@ -1,3 +1,3 @@
 Enhanced discussion support for Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.discussion
+WWW: https://pypi.org/project/plone.app.discussion/
diff --git a/www/py-plone.app.folder/pkg-descr b/www/py-plone.app.folder/pkg-descr
index 9817bc856099..2dd50e07c3d5 100644
--- a/www/py-plone.app.folder/pkg-descr
+++ b/www/py-plone.app.folder/pkg-descr
@@ -1,3 +1,3 @@
 Integration package for `plone.folder` into Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.folder
+WWW: https://pypi.org/project/plone.app.folder/
diff --git a/www/py-plone.app.form/pkg-descr b/www/py-plone.app.form/pkg-descr
index 5d379e5ae8bc..94de143b5711 100644
--- a/www/py-plone.app.form/pkg-descr
+++ b/www/py-plone.app.form/pkg-descr
@@ -1,3 +1,3 @@
 zope.formlib integration for Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.form
+WWW: https://pypi.org/project/plone.app.form/
diff --git a/www/py-plone.app.i18n/pkg-descr b/www/py-plone.app.i18n/pkg-descr
index 85f4fb852897..9866d61020ad 100644
--- a/www/py-plone.app.i18n/pkg-descr
+++ b/www/py-plone.app.i18n/pkg-descr
@@ -1,3 +1,3 @@
 Plone specific i18n extensions.
 
-WWW: https://pypi.python.org/pypi/plone.app.i18n
+WWW: https://pypi.org/project/plone.app.i18n/
diff --git a/www/py-plone.app.imaging/pkg-descr b/www/py-plone.app.imaging/pkg-descr
index 6f6048b6f21e..c2e96f80b5f3 100644
--- a/www/py-plone.app.imaging/pkg-descr
+++ b/www/py-plone.app.imaging/pkg-descr
@@ -1,3 +1,3 @@
 User-configurable, blob-aware image scaling for Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.imaging
+WWW: https://pypi.org/project/plone.app.imaging/
diff --git a/www/py-plone.app.iterate/pkg-descr b/www/py-plone.app.iterate/pkg-descr
index f38598760f16..8ed63f40562b 100644
--- a/www/py-plone.app.iterate/pkg-descr
+++ b/www/py-plone.app.iterate/pkg-descr
@@ -1,3 +1,3 @@
 Check-out/check-in staging for Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.iterate
+WWW: https://pypi.org/project/plone.app.iterate/
diff --git a/www/py-plone.app.jquery/pkg-descr b/www/py-plone.app.jquery/pkg-descr
index a1d936c2e596..8b4542f76af7 100644
--- a/www/py-plone.app.jquery/pkg-descr
+++ b/www/py-plone.app.jquery/pkg-descr
@@ -1,3 +1,3 @@
 plone.app.jquery adds jquery library to Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.jquery
+WWW: https://pypi.org/project/plone.app.jquery/
diff --git a/www/py-plone.app.jquerytools/pkg-descr b/www/py-plone.app.jquerytools/pkg-descr
index d2dc86863865..2eae0fdbaa8a 100644
--- a/www/py-plone.app.jquerytools/pkg-descr
+++ b/www/py-plone.app.jquerytools/pkg-descr
@@ -1,3 +1,3 @@
 jQuery Tools integration for Plone plus overlay and AJAX form helpers.
 
-WWW: https://pypi.python.org/pypi/plone.app.jquerytools
+WWW: https://pypi.org/project/plone.app.jquerytools/
diff --git a/www/py-plone.app.layout/pkg-descr b/www/py-plone.app.layout/pkg-descr
index 4cda670f41b6..60ea5bc4c5b0 100644
--- a/www/py-plone.app.layout/pkg-descr
+++ b/www/py-plone.app.layout/pkg-descr
@@ -1,3 +1,3 @@
 Layout mechanisms for Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.layout
+WWW: https://pypi.org/project/plone.app.layout/
diff --git a/www/py-plone.app.ldap/pkg-descr b/www/py-plone.app.ldap/pkg-descr
index eb1e8d4c55d4..02aa6d19ea65 100644
--- a/www/py-plone.app.ldap/pkg-descr
+++ b/www/py-plone.app.ldap/pkg-descr
@@ -1,3 +1,3 @@
 LDAP control panel for Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.ldap
+WWW: https://pypi.org/project/plone.app.ldap/
diff --git a/www/py-plone.app.linkintegrity/pkg-descr b/www/py-plone.app.linkintegrity/pkg-descr
index e4aaf69f5a7c..4a86716ff417 100644
--- a/www/py-plone.app.linkintegrity/pkg-descr
+++ b/www/py-plone.app.linkintegrity/pkg-descr
@@ -1,3 +1,3 @@
 Manage link integrity in Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.linkintegrity
+WWW: https://pypi.org/project/plone.app.linkintegrity/
diff --git a/www/py-plone.app.locales/pkg-descr b/www/py-plone.app.locales/pkg-descr
index 1b5e01130e25..91d7272a9b3f 100644
--- a/www/py-plone.app.locales/pkg-descr
+++ b/www/py-plone.app.locales/pkg-descr
@@ -1,3 +1,3 @@
 Translation files for Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.locales
+WWW: https://pypi.org/project/plone.app.locales/
diff --git a/www/py-plone.app.portlets/pkg-descr b/www/py-plone.app.portlets/pkg-descr
index 4035a712d947..86f5cef290a2 100644
--- a/www/py-plone.app.portlets/pkg-descr
+++ b/www/py-plone.app.portlets/pkg-descr
@@ -1,3 +1,3 @@
 Plone integration for the basic plone.portlets package.
 
-WWW: https://pypi.python.org/pypi/plone.app.portlets
+WWW: https://pypi.org/project/plone.app.portlets/
diff --git a/www/py-plone.app.querystring/pkg-descr b/www/py-plone.app.querystring/pkg-descr
index 330c4e478546..01f8fed6e977 100644
--- a/www/py-plone.app.querystring/pkg-descr
+++ b/www/py-plone.app.querystring/pkg-descr
@@ -3,4 +3,4 @@ to parse stored queries to actual results, used in new style collections.
 It includes a registry reader which reads operators, values and criteria
 from the Plone registry.
 
-WWW: https://pypi.python.org/pypi/plone.app.querystring
+WWW: https://pypi.org/project/plone.app.querystring/
diff --git a/www/py-plone.app.redirector/pkg-descr b/www/py-plone.app.redirector/pkg-descr
index 4612234e2d2f..b0d56e1a0e53 100644
--- a/www/py-plone.app.redirector/pkg-descr
+++ b/www/py-plone.app.redirector/pkg-descr
@@ -1,3 +1,3 @@
 Redirection tool.
 
-WWW: https://pypi.python.org/pypi/plone.app.redirector
+WWW: https://pypi.org/project/plone.app.redirector/
diff --git a/www/py-plone.app.registry/pkg-descr b/www/py-plone.app.registry/pkg-descr
index 7b14c71e022e..cc54ceec49f5 100644
--- a/www/py-plone.app.registry/pkg-descr
+++ b/www/py-plone.app.registry/pkg-descr
@@ -1,3 +1,3 @@
 Zope 2 and Plone integration for plone.registry.
 
-WWW: https://pypi.python.org/pypi/plone.app.registry
+WWW: https://pypi.org/project/plone.app.registry/
diff --git a/www/py-plone.app.search/pkg-descr b/www/py-plone.app.search/pkg-descr
index 468cc18ac4d2..c09d9f8269db 100644
--- a/www/py-plone.app.search/pkg-descr
+++ b/www/py-plone.app.search/pkg-descr
@@ -1,3 +1,3 @@
 Search user interface for Plone CMS.
 
-WWW: https://pypi.python.org/pypi/plone.app.search
+WWW: https://pypi.org/project/plone.app.search/
diff --git a/www/py-plone.app.testing/pkg-descr b/www/py-plone.app.testing/pkg-descr
index 42a4f11763bc..38dd8b4dc659 100644
--- a/www/py-plone.app.testing/pkg-descr
+++ b/www/py-plone.app.testing/pkg-descr
@@ -1,3 +1,3 @@
 Testing tools for Plone-the-application, based on plone.testing.
 
-WWW: https://pypi.python.org/pypi/plone.app.testing
+WWW: https://pypi.org/project/plone.app.testing/
diff --git a/www/py-plone.app.textfield/pkg-descr b/www/py-plone.app.textfield/pkg-descr
index c8e37f8b9cee..8d788345c803 100644
--- a/www/py-plone.app.textfield/pkg-descr
+++ b/www/py-plone.app.textfield/pkg-descr
@@ -3,4 +3,4 @@ can be used to store a value with a related MIME type. The value can be
 transformed to an output MIME type, for example to transform from structured
 text to HTML.
 
-WWW: https://pypi.python.org/pypi/plone.app.textfield
+WWW: https://pypi.org/project/plone.app.textfield/
diff --git a/www/py-plone.app.theming/pkg-descr b/www/py-plone.app.theming/pkg-descr
index c8e2d5f84064..1434b6663180 100644
--- a/www/py-plone.app.theming/pkg-descr
+++ b/www/py-plone.app.theming/pkg-descr
@@ -1,3 +1,3 @@
 Integrates the Diazo theming engine with Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.theming
+WWW: https://pypi.org/project/plone.app.theming/
diff --git a/www/py-plone.app.upgrade/pkg-descr b/www/py-plone.app.upgrade/pkg-descr
index 72aad1c0672e..708bf78fde93 100644
--- a/www/py-plone.app.upgrade/pkg-descr
+++ b/www/py-plone.app.upgrade/pkg-descr
@@ -1,3 +1,3 @@
 Upgrade machinery for Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.upgrade
+WWW: https://pypi.org/project/plone.app.upgrade/
diff --git a/www/py-plone.app.users/pkg-descr b/www/py-plone.app.users/pkg-descr
index 6a836019725c..56f04dcfbc0a 100644
--- a/www/py-plone.app.users/pkg-descr
+++ b/www/py-plone.app.users/pkg-descr
@@ -1,3 +1,3 @@
 A package for all things users and groups related (specific to plone).
 
-WWW: https://pypi.python.org/pypi/plone.app.users
+WWW: https://pypi.org/project/plone.app.users/
diff --git a/www/py-plone.app.uuid/pkg-descr b/www/py-plone.app.uuid/pkg-descr
index 52df8ba0534d..b94a125d0459 100644
--- a/www/py-plone.app.uuid/pkg-descr
+++ b/www/py-plone.app.uuid/pkg-descr
@@ -1,3 +1,3 @@
 Plone integration for the basic plone.uuid package.
 
-WWW: https://pypi.python.org/pypi/plone.app.uuid
+WWW: https://pypi.org/project/plone.app.uuid/
diff --git a/www/py-plone.app.viewletmanager/pkg-descr b/www/py-plone.app.viewletmanager/pkg-descr
index 3708f66f421b..e9a58d85bf50 100644
--- a/www/py-plone.app.viewletmanager/pkg-descr
+++ b/www/py-plone.app.viewletmanager/pkg-descr
@@ -1,3 +1,3 @@
 Configurable viewlet manager.
 
-WWW: https://pypi.python.org/pypi/plone.app.viewletmanager
+WWW: https://pypi.org/project/plone.app.viewletmanager/
diff --git a/www/py-plone.app.vocabularies/pkg-descr b/www/py-plone.app.vocabularies/pkg-descr
index a48f4954a515..d1a255ec656f 100644
--- a/www/py-plone.app.vocabularies/pkg-descr
+++ b/www/py-plone.app.vocabularies/pkg-descr
@@ -1,3 +1,3 @@
 A collection of generally useful vocabularies.
 
-WWW: https://pypi.python.org/pypi/plone.app.vocabularies
+WWW: https://pypi.org/project/plone.app.vocabularies/
diff --git a/www/py-plone.app.workflow/pkg-descr b/www/py-plone.app.workflow/pkg-descr
index fa8fb02cc907..df1e47e40691 100644
--- a/www/py-plone.app.workflow/pkg-descr
+++ b/www/py-plone.app.workflow/pkg-descr
@@ -1,3 +1,3 @@
 Workflow and security settings for Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.workflow
+WWW: https://pypi.org/project/plone.app.workflow/
diff --git a/www/py-plone.app.z3cform/pkg-descr b/www/py-plone.app.z3cform/pkg-descr
index f40acf1b813b..13fcfae62685 100644
--- a/www/py-plone.app.z3cform/pkg-descr
+++ b/www/py-plone.app.z3cform/pkg-descr
@@ -1,4 +1,4 @@
 A collection of widgets, templates and other components for use with z3c.form
 and Plone.
 
-WWW: https://pypi.python.org/pypi/plone.app.z3cform
+WWW: https://pypi.org/project/plone.app.z3cform/
diff --git a/www/py-plone.autoform/pkg-descr b/www/py-plone.autoform/pkg-descr
index cb746abd0365..94907e45759d 100644
--- a/www/py-plone.autoform/pkg-descr
+++ b/www/py-plone.autoform/pkg-descr
@@ -1,3 +1,3 @@
 Tools to construct z3c.form forms.
 
-WWW: https://pypi.python.org/pypi/plone.autoform
+WWW: https://pypi.org/project/plone.autoform/
diff --git a/www/py-plone.batching/pkg-descr b/www/py-plone.batching/pkg-descr
index 6b699b797ce8..0adb8f4c199c 100644
--- a/www/py-plone.batching/pkg-descr
+++ b/www/py-plone.batching/pkg-descr
@@ -1,3 +1,3 @@
 Batching facilities used in Plone.
 
-WWW: https://pypi.python.org/pypi/plone.batching
+WWW: https://pypi.org/project/plone.batching/
diff --git a/www/py-plone.behavior/pkg-descr b/www/py-plone.behavior/pkg-descr
index c40305ad8485..53c97c214803 100644
--- a/www/py-plone.behavior/pkg-descr
+++ b/www/py-plone.behavior/pkg-descr
@@ -2,4 +2,4 @@ This package provides optional support for "behaviors". A behavior is
 a re-usable aspect of an object that can be enabled or disabled without
 changing the component registry.
 
-WWW: https://pypi.python.org/pypi/plone.behavior
+WWW: https://pypi.org/project/plone.behavior/
diff --git a/www/py-plone.browserlayer/pkg-descr b/www/py-plone.browserlayer/pkg-descr
index 6ff855098546..86c13bad3cb4 100644
--- a/www/py-plone.browserlayer/pkg-descr
+++ b/www/py-plone.browserlayer/pkg-descr
@@ -1,3 +1,3 @@
 Browser layer management for Zope 2 applications.
 
-WWW: https://pypi.python.org/pypi/plone.browserlayer
+WWW: https://pypi.org/project/plone.browserlayer/
diff --git a/www/py-plone.cachepurging/pkg-descr b/www/py-plone.cachepurging/pkg-descr
index b7595355c415..f9b85fe7a189 100644
--- a/www/py-plone.cachepurging/pkg-descr
+++ b/www/py-plone.cachepurging/pkg-descr
@@ -1,3 +1,3 @@
 Cache purging support for Zope 2 applications.
 
-WWW: https://pypi.python.org/pypi/plone.cachepurging
+WWW: https://pypi.org/project/plone.cachepurging/
diff --git a/www/py-plone.caching/pkg-descr b/www/py-plone.caching/pkg-descr
index b030d5fcd30c..e03223dbe3d1 100644
--- a/www/py-plone.caching/pkg-descr
+++ b/www/py-plone.caching/pkg-descr
@@ -1,3 +1,3 @@
 Zope 2 integration for z3c.caching.
 
-WWW: https://pypi.python.org/pypi/plone.caching
+WWW: https://pypi.org/project/plone.caching/
diff --git a/www/py-plone.contentrules/pkg-descr b/www/py-plone.contentrules/pkg-descr
index e1cdf9c69977..d968ce3e435f 100644
--- a/www/py-plone.contentrules/pkg-descr
+++ b/www/py-plone.contentrules/pkg-descr
@@ -1,3 +1,3 @@
 Plone ContentRules Engine.
 
-WWW: https://pypi.python.org/pypi/plone.contentrules
+WWW: https://pypi.org/project/plone.contentrules/
diff --git a/www/py-plone.fieldsets/pkg-descr b/www/py-plone.fieldsets/pkg-descr
index 70ccddf8a8aa..aceb3586d4be 100644
--- a/www/py-plone.fieldsets/pkg-descr
+++ b/www/py-plone.fieldsets/pkg-descr
@@ -1,4 +1,4 @@
 An extension to zope.formlib, which allows to group fields into different
 fieldsets.
 
-WWW: https://pypi.python.org/pypi/plone.fieldsets
+WWW: https://pypi.org/project/plone.fieldsets/
diff --git a/www/py-plone.folder/pkg-descr b/www/py-plone.folder/pkg-descr
index b76ad3da9a88..42dfd3093124 100644
--- a/www/py-plone.folder/pkg-descr
+++ b/www/py-plone.folder/pkg-descr
@@ -1,3 +1,3 @@
 BTree-based folder implementation with order support.
 
-WWW: https://pypi.python.org/pypi/plone.folder
+WWW: https://pypi.org/project/plone.folder/
diff --git a/www/py-plone.formwidget.namedfile/pkg-descr b/www/py-plone.formwidget.namedfile/pkg-descr
index 486b64bc5c8c..bea61ff2c04c 100644
--- a/www/py-plone.formwidget.namedfile/pkg-descr
+++ b/www/py-plone.formwidget.namedfile/pkg-descr
@@ -1,4 +1,4 @@
 This package provides z3c.form widgets for file and image upload/download,
 with the option of keeping the existing file or replacing it with a new one.
 
-WWW: https://pypi.python.org/pypi/plone.formwidget.namedfile
+WWW: https://pypi.org/project/plone.formwidget.namedfile/
diff --git a/www/py-plone.i18n/pkg-descr b/www/py-plone.i18n/pkg-descr
index e55ef756cd41..d3d8e79e490a 100644
--- a/www/py-plone.i18n/pkg-descr
+++ b/www/py-plone.i18n/pkg-descr
@@ -1,3 +1,3 @@
 Advanced i18n/l10n features.
 
-WWW: https://pypi.python.org/pypi/plone.i18n
+WWW: https://pypi.org/project/plone.i18n/
diff --git a/www/py-plone.indexer/pkg-descr b/www/py-plone.indexer/pkg-descr
index eb92ad330126..99510f17e9a2 100644
--- a/www/py-plone.indexer/pkg-descr
+++ b/www/py-plone.indexer/pkg-descr
@@ -1,3 +1,3 @@
 Hooks to facilitate managing custom index values in Zope 2/CMF applications.
 
-WWW: https://pypi.python.org/pypi/plone.indexer
+WWW: https://pypi.org/project/plone.indexer/
diff --git a/www/py-plone.intelligenttext/pkg-descr b/www/py-plone.intelligenttext/pkg-descr
index b9f4553d0287..24350082a897 100644
--- a/www/py-plone.intelligenttext/pkg-descr
+++ b/www/py-plone.intelligenttext/pkg-descr
@@ -1,3 +1,3 @@
 Provides transforms from text/x-web-intelligent to text/html and vice versa.
 
-WWW: https://pypi.python.org/pypi/plone.intelligenttext
+WWW: https://pypi.org/project/plone.intelligenttext/
diff --git a/www/py-plone.locking/pkg-descr b/www/py-plone.locking/pkg-descr
index 4bb78f297941..0bc32579b105 100644
--- a/www/py-plone.locking/pkg-descr
+++ b/www/py-plone.locking/pkg-descr
@@ -1,3 +1,3 @@
 WebDAV locking support.
 
-WWW: https://pypi.python.org/pypi/plone.locking
+WWW: https://pypi.org/project/plone.locking/
diff --git a/www/py-plone.memoize/pkg-descr b/www/py-plone.memoize/pkg-descr
index 7a3812b46dfd..67046c5d1248 100644
--- a/www/py-plone.memoize/pkg-descr
+++ b/www/py-plone.memoize/pkg-descr
@@ -1,3 +1,3 @@
 Decorators for caching the values of functions and methods.
 
-WWW: https://pypi.python.org/pypi/plone.memoize
+WWW: https://pypi.org/project/plone.memoize/
diff --git a/www/py-plone.namedfile/pkg-descr b/www/py-plone.namedfile/pkg-descr
index ff176b12ea7a..3dcd6cb9dc7b 100644
--- a/www/py-plone.namedfile/pkg-descr
+++ b/www/py-plone.namedfile/pkg-descr
@@ -3,4 +3,4 @@ This package contains fields and wrapper objects for storing:
   * A file with a filename
   * An image with a filename
 
-WWW: https://pypi.python.org/pypi/plone.namedfile
+WWW: https://pypi.org/project/plone.namedfile/
diff --git a/www/py-plone.outputfilters/pkg-descr b/www/py-plone.outputfilters/pkg-descr
index 5e742c40c802..ce28f5a59673 100644
--- a/www/py-plone.outputfilters/pkg-descr
+++ b/www/py-plone.outputfilters/pkg-descr
@@ -1,3 +1,3 @@
 Transformations applied to HTML in Plone text fields as they are rendered.
 
-WWW: https://pypi.python.org/pypi/plone.outputfilters
+WWW: https://pypi.org/project/plone.outputfilters/
diff --git a/www/py-plone.portlet.collection/pkg-descr b/www/py-plone.portlet.collection/pkg-descr
index be70764639fa..6fa8635089b9 100644
--- a/www/py-plone.portlet.collection/pkg-descr
+++ b/www/py-plone.portlet.collection/pkg-descr
@@ -1,3 +1,3 @@
 A portlet that fetches results from a collection.
 
-WWW: https://pypi.python.org/pypi/plone.portlet.collection
+WWW: https://pypi.org/project/plone.portlet.collection/
diff --git a/www/py-plone.portlet.static/pkg-descr b/www/py-plone.portlet.static/pkg-descr
index 0d7c44638818..2d6bfd1bf2b4 100644
--- a/www/py-plone.portlet.static/pkg-descr
+++ b/www/py-plone.portlet.static/pkg-descr
@@ -1,3 +1,3 @@
 A simple static HTML portlet for Plone.
 
-WWW: https://pypi.python.org/pypi/plone.portlet.static
+WWW: https://pypi.org/project/plone.portlet.static/
diff --git a/www/py-plone.portlets/pkg-descr b/www/py-plone.portlets/pkg-descr
index 8ec0f604bf44..3a2d4799c700 100644
--- a/www/py-plone.portlets/pkg-descr
+++ b/www/py-plone.portlets/pkg-descr
@@ -1,3 +1,3 @@
 An extension of zope.viewlet to support dynamic portlets.
 
-WWW: https://pypi.python.org/pypi/plone.portlets
+WWW: https://pypi.org/project/plone.portlets/
diff --git a/www/py-plone.registry/pkg-descr b/www/py-plone.registry/pkg-descr
index 487de74f0e02..7d4c1f67db31 100644
--- a/www/py-plone.registry/pkg-descr
+++ b/www/py-plone.registry/pkg-descr
@@ -1,3 +1,3 @@
 A debconf-like (or about:config-like) registry for storing application settings.
 
-WWW: https://pypi.python.org/pypi/plone.registry
+WWW: https://pypi.org/project/plone.registry/
diff --git a/www/py-plone.resource/pkg-descr b/www/py-plone.resource/pkg-descr
index 3312d877de13..d582e437bf95 100644
--- a/www/py-plone.resource/pkg-descr
+++ b/www/py-plone.resource/pkg-descr
@@ -2,4 +2,4 @@ plone.resource publishes directories of static files via the ZPublisher. These
 directories may be located either in the ZODB (as OFS folders and files), or on
 the filesystem.
 
-WWW: https://pypi.python.org/pypi/plone.resource
+WWW: https://pypi.org/project/plone.resource/
diff --git a/www/py-plone.rfc822/pkg-descr b/www/py-plone.rfc822/pkg-descr
index fa7efd81cf61..6f3d880e759a 100644
--- a/www/py-plone.rfc822/pkg-descr
+++ b/www/py-plone.rfc822/pkg-descr
@@ -2,4 +2,4 @@ This package provides primitives for turning content objects described by
 ``zope.schema`` fields into RFC (2)822 style messages, as managed by the
 Python standard library's ``email`` module.
 
-WWW: https://pypi.python.org/pypi/plone.rfc822
+WWW: https://pypi.org/project/plone.rfc822/
diff --git a/www/py-plone.scale/pkg-descr b/www/py-plone.scale/pkg-descr
index ccf0dc60bf81..395e35738d52 100644
--- a/www/py-plone.scale/pkg-descr
+++ b/www/py-plone.scale/pkg-descr
@@ -1,3 +1,3 @@
 Image scaling.
 
-WWW: https://pypi.python.org/pypi/plone.scale
+WWW: https://pypi.org/project/plone.scale/
diff --git a/www/py-plone.stringinterp/pkg-descr b/www/py-plone.stringinterp/pkg-descr
index 9b9e32df2c22..e2fc9cd11259 100644
--- a/www/py-plone.stringinterp/pkg-descr
+++ b/www/py-plone.stringinterp/pkg-descr
@@ -1,3 +1,3 @@
 Adaptable string interpolation.
 
-WWW: https://pypi.python.org/pypi/plone.stringinterp
+WWW: https://pypi.org/project/plone.stringinterp/
diff --git a/www/py-plone.subrequest/pkg-descr b/www/py-plone.subrequest/pkg-descr
index 4bdd2cc23a6c..00f95186bd21 100644
--- a/www/py-plone.subrequest/pkg-descr
+++ b/www/py-plone.subrequest/pkg-descr
@@ -1,3 +1,3 @@
 Subrequests for Zope2.
 
-WWW: https://pypi.python.org/pypi/plone.subrequest
+WWW: https://pypi.org/project/plone.subrequest/
diff --git a/www/py-plone.supermodel/pkg-descr b/www/py-plone.supermodel/pkg-descr
index 199fda761fcc..51dfcb267e07 100644
--- a/www/py-plone.supermodel/pkg-descr
+++ b/www/py-plone.supermodel/pkg-descr
@@ -1,3 +1,3 @@
 Serialize Zope schema definitions to and from XML.
 
-WWW: https://pypi.python.org/pypi/plone.supermodel
+WWW: https://pypi.org/project/plone.supermodel/
diff --git a/www/py-plone.synchronize/pkg-descr b/www/py-plone.synchronize/pkg-descr
index f17889ad8f44..a10a7154152a 100644
--- a/www/py-plone.synchronize/pkg-descr
+++ b/www/py-plone.synchronize/pkg-descr
@@ -1,4 +1,4 @@
 This package provides a simple decorator to help synchronize methods across
 threads, to avoid problems of concurrent access.
 
-WWW: https://pypi.python.org/pypi/plone.synchronize
+WWW: https://pypi.org/project/plone.synchronize/
diff --git a/www/py-plone.theme/pkg-descr b/www/py-plone.theme/pkg-descr
index 3c9b923983ae..573079b8c4d0 100644
--- a/www/py-plone.theme/pkg-descr
+++ b/www/py-plone.theme/pkg-descr
@@ -1,3 +1,3 @@
 Tools for managing themes in CMF and Plone sites.
 
-WWW: https://pypi.python.org/pypi/plone.theme
+WWW: https://pypi.org/project/plone.theme/
diff --git a/www/py-plone.transformchain/pkg-descr b/www/py-plone.transformchain/pkg-descr
index df2ab699c4a4..0af6a5b12a91 100644
--- a/www/py-plone.transformchain/pkg-descr
+++ b/www/py-plone.transformchain/pkg-descr
@@ -2,4 +2,4 @@ Hook into repoze.zope2 that allows third party packages to register a sequence
 of hooks that will be allowed to modify the response before it is returned to
 the browser.
 
-WWW: https://pypi.python.org/pypi/plone.transformchain
+WWW: https://pypi.org/project/plone.transformchain/
diff --git a/www/py-plone.uuid/pkg-descr b/www/py-plone.uuid/pkg-descr
index 31e76fa24eaa..3cb1e688ab6d 100644
--- a/www/py-plone.uuid/pkg-descr
+++ b/www/py-plone.uuid/pkg-descr
@@ -1,3 +1,3 @@
 UUIDs for content items.
 
-WWW: https://pypi.python.org/pypi/plone.uuid
+WWW: https://pypi.org/project/plone.uuid/
diff --git a/www/py-plone.z3cform/pkg-descr b/www/py-plone.z3cform/pkg-descr
index 33cb2ecb95e7..4d6746767b36 100644
--- a/www/py-plone.z3cform/pkg-descr
+++ b/www/py-plone.z3cform/pkg-descr
@@ -1,3 +1,3 @@
 plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF.
 
-WWW: https://pypi.python.org/pypi/plone.z3cform
+WWW: https://pypi.org/project/plone.z3cform/
diff --git a/www/py-plonetheme.classic/pkg-descr b/www/py-plonetheme.classic/pkg-descr
index 2d594d76170a..42e9924a8ca8 100644
--- a/www/py-plonetheme.classic/pkg-descr
+++ b/www/py-plonetheme.classic/pkg-descr
@@ -1,3 +1,3 @@
 The classic Plone 3 default theme.
 
-WWW: https://pypi.python.org/pypi/plonetheme.classic
+WWW: https://pypi.org/project/plonetheme.classic/
diff --git a/www/py-plonetheme.sunburst/pkg-descr b/www/py-plonetheme.sunburst/pkg-descr
index c71c29c61889..4e2cfc32ce6d 100644
--- a/www/py-plonetheme.sunburst/pkg-descr
+++ b/www/py-plonetheme.sunburst/pkg-descr
@@ -1,3 +1,3 @@
 The default theme for Plone 4.
 
-WWW: https://pypi.python.org/pypi/plonetheme.sunburst
+WWW: https://pypi.org/project/plonetheme.sunburst/
diff --git a/www/py-pyquery/pkg-descr b/www/py-pyquery/pkg-descr
index 99440c53be19..7a4cf63c3d8e 100644
--- a/www/py-pyquery/pkg-descr
+++ b/www/py-pyquery/pkg-descr
@@ -2,4 +2,4 @@ pyquery allows you to make jquery queries on XML documents.
 The API is as much as possible the similar to jquery (http://jquery.com).
 pyquery uses lxml for fast XML and HTML manipulation.
 
-WWW: https://pypi.python.org/pypi/pyquery
+WWW: https://pypi.org/project/pyquery/
diff --git a/www/py-pyramid_rpc/pkg-descr b/www/py-pyramid_rpc/pkg-descr
index 08d0e0120b61..4522d42881ea 100644
--- a/www/py-pyramid_rpc/pkg-descr
+++ b/www/py-pyramid_rpc/pkg-descr
@@ -1,4 +1,4 @@
 pyramid_rpc is a package of RPC related add-on's to make it easier to
 create RPC services.
 
-WWW: https://pypi.python.org/pypi/pyramid_rpc
+WWW: https://pypi.org/project/pyramid_rpc/
diff --git a/www/py-python-dotenv/pkg-descr b/www/py-python-dotenv/pkg-descr
index 10881f02ac45..9b99b14d3290 100644
--- a/www/py-python-dotenv/pkg-descr
+++ b/www/py-python-dotenv/pkg-descr
@@ -2,5 +2,5 @@ python-dotenv reads the key,value pair from .env and adds them to environment
 variable. It is great of managing app settings during development and in
 production using 12-factor principles.
 
-WWW: https://pypi.python.org/pypi/python-dotenv
+WWW: https://pypi.org/project/python-dotenv/
 WWW: https://github.com/theskumar/python-dotenv
diff --git a/www/py-recaptcha/pkg-descr b/www/py-recaptcha/pkg-descr
index 9018b1dfe397..957e22e77c71 100644
--- a/www/py-recaptcha/pkg-descr
+++ b/www/py-recaptcha/pkg-descr
@@ -5,4 +5,4 @@ requires pycrypto. This library requires two types of API keys. If you'd like
 to use the CAPTCHA, you'll need a key from http://recaptcha.net/api/getkey.
 For Mailhide, you'll need a key from http://mailhide.recaptcha.net/apikey.
 
-WWW: https://pypi.python.org/pypi/recaptcha-client
+WWW: https://pypi.org/project/recaptcha-client/
diff --git a/www/py-requests-mock/pkg-descr b/www/py-requests-mock/pkg-descr
index e694ef777a27..75ddbdf67a95 100644
--- a/www/py-requests-mock/pkg-descr
+++ b/www/py-requests-mock/pkg-descr
@@ -1,4 +1,4 @@
 requests-mock provides a building block to stub out the HTTP requests portions
 of your testing code.
 
-WWW: https://pypi.python.org/pypi/requests-mock
+WWW: https://pypi.org/project/requests-mock/
diff --git a/www/py-rfc3987/pkg-descr b/www/py-rfc3987/pkg-descr
index 1536f333d06b..1df4af6c6aa4 100644
--- a/www/py-rfc3987/pkg-descr
+++ b/www/py-rfc3987/pkg-descr
@@ -6,4 +6,4 @@ resolution of references.
  * http://tools.ietf.org/html/rfc3986
  * http://tools.ietf.org/html/rfc3987
 
-WWW: https://pypi.python.org/pypi/rfc3987
+WWW: https://pypi.org/project/rfc3987/
diff --git a/www/py-selector/pkg-descr b/www/py-selector/pkg-descr
index c0c24b275d0c..ae2a5416cd87 100644
--- a/www/py-selector/pkg-descr
+++ b/www/py-selector/pkg-descr
@@ -9,5 +9,5 @@ expressions directly or even create our own mini-language. There is a simple
 features (to MVC or whatever). Neither are there any framework specific
 features.
 
-WWW: https://pypi.python.org/pypi/selector
+WWW: https://pypi.org/project/selector/
 WWW: https://github.com/lukearno/selector
diff --git a/www/py-sockjs-tornado/pkg-descr b/www/py-sockjs-tornado/pkg-descr
index 3e2742c950ff..2094c115b326 100644
--- a/www/py-sockjs-tornado/pkg-descr
+++ b/www/py-sockjs-tornado/pkg-descr
@@ -1,4 +1,4 @@
 SockJS-tornado is a Python server side counterpart of SockJS-client browser
 library running on top of Tornado framework.
 
-WWW: https://pypi.python.org/pypi/sockjs-tornado
+WWW: https://pypi.org/project/sockjs-tornado/
diff --git a/www/py-spyne/pkg-descr b/www/py-spyne/pkg-descr
index 56c3fa649103..3667fee46095 100644
--- a/www/py-spyne/pkg-descr
+++ b/www/py-spyne/pkg-descr
@@ -4,5 +4,5 @@ have a well-defined API using multiple protocols and transports.
 It integrates with popular Python web frameworks as well as libraries like
 SQLAlchemy to keep your code as DRY (Don't Repeat Yourself) as possible.
 
-WWW: https://pypi.python.org/pypi/spyne
+WWW: https://pypi.org/project/spyne/
 WWW: http://spyne.io/
diff --git a/www/py-swapper/pkg-descr b/www/py-swapper/pkg-descr
index dbb5559d1ef3..dddfd9074360 100644
--- a/www/py-swapper/pkg-descr
+++ b/www/py-swapper/pkg-descr
@@ -2,5 +2,5 @@ Swapper is an unofficial API for the undocumented but very powerful Django
 feature: swappable models. Swapper facilitates implementing arbitrary swappable
 models in your own reusable apps.
 
-WWW: https://pypi.python.org/pypi/swapper
+WWW: https://pypi.org/project/swapper/
 WWW: https://github.com/wq/django-swappable-models
diff --git a/www/py-tmdb3/pkg-descr b/www/py-tmdb3/pkg-descr
index 1b19318aec47..61d368fd65c0 100644
--- a/www/py-tmdb3/pkg-descr
+++ b/www/py-tmdb3/pkg-descr
@@ -1,3 +1,3 @@
 TheMovieDB.org APIv3 interface
 
-WWW: https://pypi.python.org/pypi/tmdb3
+WWW: https://pypi.org/project/tmdb3/
diff --git a/www/py-tvdb_api/pkg-descr b/www/py-tvdb_api/pkg-descr
index 3eec92b3272d..271455c59327 100644
--- a/www/py-tvdb_api/pkg-descr
+++ b/www/py-tvdb_api/pkg-descr
@@ -1,3 +1,3 @@
 An easy to use API interface to TheTVDB.com.
 
-WWW: https://pypi.python.org/pypi/tvdb_api
+WWW: https://pypi.org/project/tvdb_api/
diff --git a/www/py-uliweb/pkg-descr b/www/py-uliweb/pkg-descr
index cf9cdaf087f4..c68e3b85e048 100644
--- a/www/py-uliweb/pkg-descr
+++ b/www/py-uliweb/pkg-descr
@@ -1,3 +1,3 @@
 Uliweb is a Python based web framework.
 
-WWW: https://pypi.python.org/pypi/Uliweb
+WWW: https://pypi.org/project/Uliweb/
diff --git a/www/py-user_agent/pkg-descr b/www/py-user_agent/pkg-descr
index 4ac5e2af28ef..f579ca15e3b0 100644
--- a/www/py-user_agent/pkg-descr
+++ b/www/py-user_agent/pkg-descr
@@ -1,4 +1,4 @@
 This module is for generating random, valid web navigator's configs
 & User-Agent HTTP headers.
 
-WWW: https://pypi.python.org/pypi/user_agent
+WWW: https://pypi.org/project/user_agent/
diff --git a/www/py-waitress/pkg-descr b/www/py-waitress/pkg-descr
index ff86718232ef..db799f5b94cf 100644
--- a/www/py-waitress/pkg-descr
+++ b/www/py-waitress/pkg-descr
@@ -1,3 +1,3 @@
 Waitress, is pure Python WSGI server.
 
-WWW: https://pypi.python.org/pypi/waitress
+WWW: https://pypi.org/project/waitress/
diff --git a/www/py-wsgiauth/pkg-descr b/www/py-wsgiauth/pkg-descr
index 6fc5ef380164..8c5154f67902 100644
--- a/www/py-wsgiauth/pkg-descr
+++ b/www/py-wsgiauth/pkg-descr
@@ -2,4 +2,4 @@ WSGI authentication middleware that supports HTTP basic
 and digest authentication, IP authentication, and form-based or OpenID
 authentication using signed cookies or URL query parameters.
 
-WWW: https://pypi.python.org/pypi/wsgiauth
+WWW: https://pypi.org/project/wsgiauth/
diff --git a/www/py-zope.app.wsgi/pkg-descr b/www/py-zope.app.wsgi/pkg-descr
index a96fe4033e40..ee5e03c49ea8 100644
--- a/www/py-zope.app.wsgi/pkg-descr
+++ b/www/py-zope.app.wsgi/pkg-descr
@@ -1,3 +1,3 @@
 WSGI application for the zope.publisher.
 
-WWW: https://pypi.python.org/pypi/zope.app.wsgi
+WWW: https://pypi.org/project/zope.app.wsgi/
diff --git a/www/uwsgitop/pkg-descr b/www/uwsgitop/pkg-descr
index 7cfeadd69651..aae576824d9e 100644
--- a/www/uwsgitop/pkg-descr
+++ b/www/uwsgitop/pkg-descr
@@ -7,4 +7,4 @@ Then connect uwsgitop to the stats socket
 
 uwsgitop /tmp/stats.socket
 
-WWW: https://pypi.python.org/pypi/uwsgitop
+WWW: https://pypi.org/project/uwsgitop/