diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 20641603..fb178699 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -1,4 +1,4 @@
-site_name: Nominatim 3.5.1
+site_name: Nominatim 3.5.2
 theme: readthedocs
 docs_dir: ${CMAKE_CURRENT_BINARY_DIR}
 site_url: https://nominatim.org
diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh
index 46674d19..adddfbd0 100755
--- a/vagrant/Install-on-Centos-7.sh
+++ b/vagrant/Install-on-Centos-7.sh
@@ -35,7 +35,7 @@
 
     sudo yum install -y postgresql11-server postgresql11-contrib postgresql11-devel \
                         postgis25_11 postgis25_11-utils \
-                        wget git cmake make gcc gcc-c++ libtool policycoreutils-python \
+                        wget cmake make gcc gcc-c++ libtool policycoreutils-python \
                         devtoolset-7 llvm-toolset-7 \
                         php-pgsql php php-intl libpqxx-devel \
                         proj-epsg bzip2-devel proj-devel boost-devel \
@@ -151,8 +151,8 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
 #
 if [ "x$1" == "xyes" ]; then  #DOCS:    :::sh
     cd $USERHOME
-    wget https://nominatim.org/release/Nominatim-3.5.1.tar.bz2
-    tar xf Nominatim-3.5.1.tar.bz2
+    wget https://nominatim.org/release/Nominatim-3.5.2.tar.bz2
+    tar xf Nominatim-3.5.2.tar.bz2
 else                               #DOCS:
     cd $USERHOME/Nominatim         #DOCS:
 fi                                 #DOCS:
@@ -164,7 +164,7 @@ fi                                 #DOCS:
     cd $USERHOME
     mkdir build
     cd build
-    cmake $USERHOME/Nominatim-3.5.1
+    cmake $USERHOME/Nominatim-3.5.2
     make
 
 #
@@ -175,10 +175,10 @@ fi                                 #DOCS:
 # with a web server accessible from the Internet. At a minimum the
 # following SELinux labeling should be done for Nominatim:
 
-    sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/Nominatim-3.5.1/(website|lib|settings)(/.*)?"
+    sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/Nominatim-3.5.2/(website|lib|settings)(/.*)?"
     sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/build/(website|lib|settings)(/.*)?"
     sudo semanage fcontext -a -t lib_t "$USERHOME/build/module/nominatim.so"
-    sudo restorecon -R -v $USERHOME/Nominatim-3.5.1
+    sudo restorecon -R -v $USERHOME/Nominatim-3.5.2
     sudo restorecon -R -v $USERHOME/build
 
 
diff --git a/vagrant/Install-on-Centos-8.sh b/vagrant/Install-on-Centos-8.sh
index 01649951..268a402b 100755
--- a/vagrant/Install-on-Centos-8.sh
+++ b/vagrant/Install-on-Centos-8.sh
@@ -28,7 +28,7 @@
 #DOCS:    :::sh
     sudo dnf --enablerepo=PowerTools install -y postgresql12-server \
                         postgresql12-contrib postgresql12-devel postgis30_12 \
-                        wget git cmake make gcc gcc-c++ libtool policycoreutils-python-utils \
+                        wget cmake make gcc gcc-c++ libtool policycoreutils-python-utils \
                         llvm-toolset ccache clang-tools-extra \
                         php-pgsql php php-intl php-json libpq-devel \
                         bzip2-devel proj-devel boost-devel \
@@ -145,8 +145,8 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
 #
 if [ "x$1" == "xyes" ]; then  #DOCS:    :::sh
     cd $USERHOME
-    wget https://nominatim.org/release/Nominatim-3.5.1.tar.bz2
-    tar xf Nominatim-3.5.1.tar.bz2
+    wget https://nominatim.org/release/Nominatim-3.5.2.tar.bz2
+    tar xf Nominatim-3.5.2.tar.bz2
 else                               #DOCS:
     cd $USERHOME/Nominatim         #DOCS:
 fi                                 #DOCS:
@@ -158,7 +158,7 @@ fi                                 #DOCS:
     cd $USERHOME
     mkdir build
     cd build
-    cmake $USERHOME/Nominatim-3.5.1
+    cmake $USERHOME/Nominatim-3.5.2
     make
 
 #
@@ -169,10 +169,10 @@ fi                                 #DOCS:
 # with a web server accessible from the Internet. At a minimum the
 # following SELinux labeling should be done for Nominatim:
 
-    sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/Nominatim-3.5.1/(website|lib|settings)(/.*)?"
+    sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/Nominatim-3.5.2/(website|lib|settings)(/.*)?"
     sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/build/(website|lib|settings)(/.*)?"
     sudo semanage fcontext -a -t lib_t "$USERHOME/build/module/nominatim.so"
-    sudo restorecon -R -v $USERHOME/Nominatim-3.5.1
+    sudo restorecon -R -v $USERHOME/Nominatim-3.5.2
     sudo restorecon -R -v $USERHOME/build
 
 
diff --git a/vagrant/Install-on-Ubuntu-18-nginx.sh b/vagrant/Install-on-Ubuntu-18-nginx.sh
index 382df6b2..f619557e 100755
--- a/vagrant/Install-on-Ubuntu-18-nginx.sh
+++ b/vagrant/Install-on-Ubuntu-18-nginx.sh
@@ -24,7 +24,7 @@ export DEBIAN_FRONTEND=noninteractive
                             postgresql-contrib-10 \
                             nginx php-fpm php php-pgsql \
                             php-intl python3-setuptools python3-dev python3-pip \
-                            python3-psycopg2 python3-tidylib git
+                            python3-psycopg2 python3-tidylib
 
     export USERNAME=vagrant
     export USERHOME=/home/vagrant
diff --git a/vagrant/Install-on-Ubuntu-18.sh b/vagrant/Install-on-Ubuntu-18.sh
index e82f47b0..5421c182 100755
--- a/vagrant/Install-on-Ubuntu-18.sh
+++ b/vagrant/Install-on-Ubuntu-18.sh
@@ -31,7 +31,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
                             postgresql-contrib-10 postgresql-10-postgis-scripts \
                             apache2 php php-pgsql libapache2-mod-php \
                             php-intl python3-setuptools python3-dev python3-pip \
-                            python3-psycopg2 python3-tidylib git
+                            python3-psycopg2 python3-tidylib
 
 
 #
@@ -127,8 +127,8 @@ sudo sed -i 's:#.*::' /etc/apache2/conf-available/nominatim.conf #DOCS:
 #
 if [ "x$1" == "xyes" ]; then  #DOCS:    :::sh
     cd $USERHOME
-    wget https://nominatim.org/release/Nominatim-3.5.1.tar.bz2
-    tar xf Nominatim-3.5.1.tar.bz2
+    wget https://nominatim.org/release/Nominatim-3.5.2.tar.bz2
+    tar xf Nominatim-3.5.2.tar.bz2
 else                               #DOCS:
     cd $USERHOME/Nominatim         #DOCS:
 fi                                 #DOCS:
@@ -139,7 +139,7 @@ fi                                 #DOCS:
     cd $USERHOME                   #DOCS:    :::sh
     mkdir build
     cd build
-    cmake $USERHOME/Nominatim-3.5.1
+    cmake $USERHOME/Nominatim-3.5.2
     make
 
 # You need to create a minimal configuration file that tells nominatim
diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh
index b631fde8..442da464 100644
--- a/vagrant/Install-on-Ubuntu-20.sh
+++ b/vagrant/Install-on-Ubuntu-20.sh
@@ -33,7 +33,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
                             postgresql-contrib postgresql-12-postgis-3-scripts \
                             apache2 php php-pgsql libapache2-mod-php \
                             php-intl python3-setuptools python3-dev python3-pip \
-                            python3-psycopg2 python3-tidylib git
+                            python3-psycopg2 python3-tidylib
 
 #
 # System Configuration
@@ -128,26 +128,19 @@ sudo sed -i 's:#.*::' /etc/apache2/conf-available/nominatim.conf #DOCS:
 #
 if [ "x$1" == "xyes" ]; then  #DOCS:    :::sh
     cd $USERHOME
-    wget https://nominatim.org/release/Nominatim-3.5.1.tar.bz2
-    tar xf Nominatim-3.5.1.tar.bz2
+    wget https://nominatim.org/release/Nominatim-3.5.2.tar.bz2
+    tar xf Nominatim-3.5.2.tar.bz2
 else                               #DOCS:
     cd $USERHOME/Nominatim         #DOCS:
 fi                                 #DOCS:
 
-# When installing the latest source from github, you also need to
-# download the country grid:
-
-if [ ! -f data/country_osm_grid.sql.gz ]; then       #DOCS:    :::sh
-    wget -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
-fi                                 #DOCS:
-
 # The code must be built in a separate directory. Create this directory,
 # then configure and build Nominatim in there:
 
     cd $USERHOME
     mkdir build
     cd build
-    cmake $USERHOME/Nominatim-3.5.1
+    cmake $USERHOME/Nominatim-3.5.2
     make
 
 # You need to create a minimal configuration file that tells nominatim