diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41ef45882abca269d246da5d8402b916b3227241..2d345728f84fcb680ddbd0d9f461fbda501445a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+Upcoming version:
+-----------------
+  - updating geoserver to latest version (Nikolaus Krismer)
+
 Version v0.8.1:
 ---------------
   - not re-download sql dump if it is already present in sql directory (and UPDATE_DATA is not set to true) (Nikolaus Krismer)
diff --git a/bootstrap/prepareEnvironment.sh b/bootstrap/prepareEnvironment.sh
index 96c95f5a4af8b0c4c40977bf1eaa3a4816c9c510..162f5d9562c83b25f811df7ceebad39f793702f0 100755
--- a/bootstrap/prepareEnvironment.sh
+++ b/bootstrap/prepareEnvironment.sh
@@ -79,7 +79,7 @@ fn_arg2boolean IS_JENKINS_DEPLOY "${3}" "${IS_JENKINS_DEPLOY}"
 GDAL_VERSION="2.1.1"
 GDAL_FILE="gdal-$GDAL_VERSION.tar.gz"
 GDAL_DOWNLOAD_URL="http://download.osgeo.org/gdal/$GDAL_VERSION/$GDAL_FILE"
-GEOSERVER_VERSION="2.10.0"
+GEOSERVER_VERSION="2.10.1"
 GEOSERVER_FILE="geoserver-$GEOSERVER_VERSION-war.zip"
 GEOSERVER_DOWNLOAD_URL="http://sourceforge.net/projects/geoserver/files/GeoServer/$GEOSERVER_VERSION/$GEOSERVER_FILE"
 GEOSERVER_SHELL_VERSION="0.2.1"