diff --git a/README.md b/README.md
index 8e36d50e..208f4afe 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ Now start up the database container.
 docker-compose up -d postgres
 ```
 
-Import external data from [OpenStreetMapData](http://openstreetmapdata.com/), [Natural Earth](http://www.naturalearthdata.com/) and  [OpenStreetMap Lake Labels](https://github.com/lukasmartinelli/osm-lakelines).
+Import external data from [OpenStreetMapData](http://osmdata.openstreetmap.de/), [Natural Earth](http://www.naturalearthdata.com/) and [OpenStreetMap Lake Labels](https://github.com/lukasmartinelli/osm-lakelines).
 
 ```bash
 docker-compose run import-water
diff --git a/docker-compose.yml b/docker-compose.yml
index 12bf3929..5d627076 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
     networks:
     - postgres_conn
   import-water:
-    image: "openmaptiles/import-water:0.6"
+    image: "openmaptiles/import-water:1.0"
     env_file: .env
     networks:
     - postgres_conn
diff --git a/layers/water/water.yaml b/layers/water/water.yaml
index 934e78bf..fb1f307d 100644
--- a/layers/water/water.yaml
+++ b/layers/water/water.yaml
@@ -4,14 +4,14 @@ layer:
       Water polygons representing oceans and lakes. Covered watered areas are excluded (`covered=yes`).
       On low zoom levels all water originates from Natural Earth. To get a more correct display of the south pole you should also
       style the covering ice shelves over the water.
-      On higher zoom levels water polygons from [OpenStreetMapData](http://openstreetmapdata.com/) are used.
+      On higher zoom levels water polygons from [OpenStreetMapData](http://osmdata.openstreetmap.de/) are used.
       The polygons are split into many smaller polygons to improve rendering performance.
       This however can lead to less rendering options in clients since these boundaries show up. So you might not be
       able to use border styling for ocean water features.
   fields:
     class:
       description: |
-          All water polygons from [OpenStreetMapData](http://openstreetmapdata.com/) have the class `ocean`.
+          All water polygons from [OpenStreetMapData](http://osmdata.openstreetmap.de/) have the class `ocean`.
           Water bodies are classified as `lake` or `river` for water bodies with the [`waterway`](http://wiki.openstreetmap.org/wiki/Key:waterway) tag.
       values:
       - ocean
diff --git a/quickstart.sh b/quickstart.sh
index e8110966..dbf1ee3e 100755
--- a/quickstart.sh
+++ b/quickstart.sh
@@ -192,10 +192,10 @@ make forced-clean-sql
 
 echo " "
 echo "-------------------------------------------------------------------------------------"
-echo "====> : Start importing water data from http://openstreetmapdata.com into PostgreSQL "
+echo "====> : Start importing water data from http://osmdata.openstreetmap.de/ into PostgreSQL "
 echo "      : Source code:  https://github.com/openmaptiles/import-water "
-echo "      : Data license: http://openstreetmapdata.com/info/license  "
-echo "      : Thank you: http://openstreetmapdata.com/info/supporting "
+echo "      : Data license: https://osmdata.openstreetmap.de/info/license.html "
+echo "      : Thank you: https://osmdata.openstreetmap.de/info/ "
 docker-compose run --rm import-water
 
 echo " "