diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b08f1a81..c81aaaace 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -419,7 +419,7 @@ endif()
 # pkg-config
 ecbuild_pkgconfig(
   NAME           eccodes
-  URL            "https://software.ecmwf.int/wiki/display/ECC/"
+  URL            "https://confluence.ecmwf.int/display/ECC/"
   DESCRIPTION    "The ecCodes library"
   LIBRARIES      eccodes
   IGNORE_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIRS} ${NETCDF_INCLUDE_DIRS}
@@ -430,7 +430,7 @@ ecbuild_pkgconfig(
 if( HAVE_FORTRAN )
   ecbuild_pkgconfig(
     NAME                eccodes_f90
-    URL                 "https://software.ecmwf.int/wiki/display/ECC/"
+    URL                 "https://confluence.ecmwf.int/display/ECC/"
     LIBRARIES           eccodes_f90 eccodes
     DESCRIPTION         "The ecCodes library for Fortran 90"
     IGNORE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/fortran ${PROJECT_BINARY_DIR}/fortran
diff --git a/ChangeLog b/ChangeLog
index 579db95fd..cb87e6734 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
 The changelog is now online. Please see:
 
-https://software.ecmwf.int/wiki/display/ECC/History+of+Changes
+https://confluence.ecmwf.int/display/ECC/History+of+Changes
 
diff --git a/INSTALL b/INSTALL
index 6688d2e77..e4bcecd46 100644
--- a/INSTALL
+++ b/INSTALL
@@ -14,7 +14,7 @@ Installation using CMake
 This is the recommended method of installation.
 However it requires that cmake be installed on your system.
 
-1. Download ecCodes from https://software.ecmwf.int/wiki/display/ECC/Releases
+1. Download ecCodes from https://confluence.ecmwf.int/display/ECC/Releases
 
 2. Unpack distribution:
    > tar -xzf eccodes-x.y.z-Source.tar.gz
@@ -52,5 +52,5 @@ In this mode the tests will take longer and you need to be connected to the inte
 for the tests.
 
 For more details, please see:
-https://software.ecmwf.int/wiki/display/ECC/ecCodes+installation
+https://confluence.ecmwf.int/display/ECC/ecCodes+installation
 
diff --git a/NEWS b/NEWS
index 3f70cb5c6..e58b3759d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1 @@
-See https://software.ecmwf.int/wiki/display/ECC/Latest+news
-
+See https://confluence.ecmwf.int/display/ECC/Latest+news
diff --git a/README.md b/README.md
index 3f0172ab2..b4d82618d 100644
--- a/README.md
+++ b/README.md
@@ -19,12 +19,12 @@ It is designed to provide the user with a simple set of functions to access data
 several formats with a key/value approach.
 
 Documentation can be found here:
-   https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home
+   https://confluence.ecmwf.int/display/ECC/ecCodes+Home
 
 INSTALLATION
 ------------
 
-1. Download ecCodes from https://software.ecmwf.int/wiki/display/ECC/Releases
+1. Download ecCodes from https://confluence.ecmwf.int/display/ECC/Releases
 
 2. Unpack distribution:
    > tar -xzf eccodes-x.y.z-Source.tar.gz
@@ -45,7 +45,7 @@ INSTALLATION
 
 
 For more details, please see:
-https://software.ecmwf.int/wiki/display/ECC/ecCodes+installation
+https://confluence.ecmwf.int/display/ECC/ecCodes+installation
 
 If you encounter any problems please send an e-mail with your problem to:
 
diff --git a/python/README b/python/README
index fb798bc9d..368e116fe 100755
--- a/python/README
+++ b/python/README
@@ -1,24 +1,15 @@
-GRIB API Python bindings
+ecCodes Python bindings
 
 In order to enable the Python bindings in the build,
-use the --enable-python configure flag.
+use the -DENABLE_PYTHON=ON in the cmake step:
 
-./configure --enable-python
+  cmake /path/to/src -DENABLE_PYTHON=ON
 
 This will enable the build of the Python bindings with 
 NumPy support enabled. Python needs to be in the path
 and, of course, the NumPy package installed.
 
-To build the Python bindings without NumPy support, use 
-the --disable-numpy configure flag. This will result in
-Python array objects being used for data handling.
-
 On 'make install', the Python bindings will be installed under
-'${GRIBAPI_install_dir}/lib/pythonX.X/site-packages/grib_api',
+'${ecCodes_install_dir}/lib/pythonX.X/site-packages/eccodes',
 where X.X is the version of python used to build the bindings.
 Add this folder to your PYTHONPATH and you are ready to go.
-
-For more information on the Python bindings, please visit our
-website at:
-
-http://www.ecmwf.int/publications/manuals/grib_api/
diff --git a/python/setup.py.in b/python/setup.py.in
index 6a12698a4..f54d42893 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -71,7 +71,7 @@ setup(name='eccodes',
       author_email='Software.Support@ecmwf.int',
       description="""Python interface for ecCodes""",
       license='Apache License, Version 2.0',
-      url='https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home',
-      download_url='https://software.ecmwf.int/wiki/display/ECC/Releases',
+      url='https://confluence.ecmwf.int/display/ECC/ecCodes+Home',
+      download_url='https://confluence.ecmwf.int/display/ECC/Releases',
       ext_modules=[Extension('gribapi._gribapi_swig', **attdict)],
       packages=['eccodes', 'eccodes.high_level', 'gribapi'])
diff --git a/python3/setup.py.in b/python3/setup.py.in
index 2eceb3d2b..57dc65460 100644
--- a/python3/setup.py.in
+++ b/python3/setup.py.in
@@ -71,7 +71,7 @@ setup(name='eccodes',
       author_email='Software.Support@ecmwf.int',
       description="""Python 3 interface for ecCodes""",
       license='Apache License, Version 2.0',
-      url='https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home',
-      download_url='https://software.ecmwf.int/wiki/display/ECC/Releases',
+      url='https://confluence.ecmwf.int/display/ECC/ecCodes+Home',
+      download_url='https://confluence.ecmwf.int/display/ECC/Releases',
       ext_modules=[Extension('gribapi._gribapi_swig', **attdict)],
       packages=['eccodes', 'eccodes.high_level', 'gribapi'])