diff --git a/lib/pypiCoordinatesMapper.js b/lib/pypiCoordinatesMapper.js
index f2c0141b..b58d377e 100644
--- a/lib/pypiCoordinatesMapper.js
+++ b/lib/pypiCoordinatesMapper.js
@@ -6,7 +6,7 @@ const EntityCoordinates = require('./entityCoordinates')
 
 class PypiCoordinatesMapper {
   constructor(fetch = requestPromise) {
-    this.baseUrl = 'https://pypi.python.org'
+    this.baseUrl = 'https://pypi.org'
     this._fetch = fetch
   }
 
@@ -23,7 +23,8 @@ class PypiCoordinatesMapper {
 
   async _resolve(coordinates) {
     if (coordinates.name === '..') return null
-    const url = new URL(`/pypi/${coordinates.name}/json`, this.baseUrl).toString()
+    const encodedName = encodeURIComponent(coordinates.name)
+    const url = new URL(`/pypi/${encodedName}/json`, this.baseUrl).toString()
     try {
       const answer = await this._fetch({ url, method: 'GET', json: true })
       return answer?.info?.name && { name: answer.info.name }
diff --git a/routes/originPyPi.js b/routes/originPyPi.js
index f9e42021..0a0c7704 100644
--- a/routes/originPyPi.js
+++ b/routes/originPyPi.js
@@ -28,7 +28,7 @@ router.get(
   })
 )
 async function getPypiData(name) {
-  const url = `https://pypi.python.org/pypi/${encodeURIComponent(name)}/json`
+  const url = `https://pypi.org/pypi/${encodeURIComponent(name)}/json`
   try {
     return await requestPromise({ url, method: 'GET', json: true })
   } catch (error) {