diff --git a/sysutils/py-google-compute-engine/Makefile b/sysutils/py-google-compute-engine/Makefile
index 2af57b0d2f37..7a2ba595e287 100644
--- a/sysutils/py-google-compute-engine/Makefile
+++ b/sysutils/py-google-compute-engine/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	google-compute-engine
-DISTVERSION=	2.8.16
+DISTVERSION=	2.8.17
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Guest Environment for Google Compute Engine
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
 		google_oslogin_control:sysutils/google-compute-engine-oslogin \
 		sudo:security/sudo
 
 .if ${FLAVOR:Upy36:Mpy3*}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR}
 .endif
 
 USES=		python:3.6+ shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 
 WRKSRC_SUBDIR=	packages/python-google-compute-engine
 
 NO_ARCH=	yes
 SHEBANG_FILES=	../google-compute-engine/src/usr/bin/google_optimize_local_ssd \
 		../google-compute-engine/src/usr/bin/google_set_multiqueue
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	GoogleCloudPlatform
 GH_PROJECT=	compute-image-packages
 GH_TAGNAME=	20190522
 
 USE_RC_SUBR=	google_accounts_daemon google_clock_skew_daemon \
 		google_instance_setup google_network_daemon google_startup
 
 SUB_LIST=	PYTHON_CMD="${PYTHON_CMD}" \
 		PYTHON_VER="${PYTHON_VER}"
 REINPLACE_ARGS=	-i ''
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d ${STAGEDIR}/etc
 	${INSTALL_DATA} ${FILESDIR}/instance_configs.cfg.distro.sample \
 		${STAGEDIR}${PREFIX}/etc/instance_configs.cfg.distro.sample
 	${INSTALL_DATA} ${FILESDIR}/90-google.conf.sample \
 		${STAGEDIR}${PREFIX}/etc/syslog.d/90-google.conf.sample
 	${INSTALL_DATA} ${FILESDIR}/google_set_hostname \
 		${STAGEDIR}/etc/dhclient-exit-hooks
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-google-compute-engine/distinfo b/sysutils/py-google-compute-engine/distinfo
index 30ea86625f58..fd869ea55c26 100644
--- a/sysutils/py-google-compute-engine/distinfo
+++ b/sysutils/py-google-compute-engine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558977378
-SHA256 (GoogleCloudPlatform-compute-image-packages-2.8.16-20190522_GH0.tar.gz) = 8cfb338c3c768ea7e76e479728a1438b2f10b0df13bddd70c9fbcbfc1273efd6
-SIZE (GoogleCloudPlatform-compute-image-packages-2.8.16-20190522_GH0.tar.gz) = 132314
+TIMESTAMP = 1618297612
+SHA256 (GoogleCloudPlatform-compute-image-packages-2.8.17-20190522_GH0.tar.gz) = 8cfb338c3c768ea7e76e479728a1438b2f10b0df13bddd70c9fbcbfc1273efd6
+SIZE (GoogleCloudPlatform-compute-image-packages-2.8.17-20190522_GH0.tar.gz) = 132314
diff --git a/sysutils/py-google-compute-engine/files/google_set_hostname b/sysutils/py-google-compute-engine/files/google_set_hostname
index f5aa3a2a415d..f0d50de9ef26 100644
--- a/sysutils/py-google-compute-engine/files/google_set_hostname
+++ b/sysutils/py-google-compute-engine/files/google_set_hostname
@@ -1,120 +1,60 @@
 #!/bin/sh
 # Copyright 2016 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # Deal with a new hostname assignment.
 
 if [ -n "$new_host_name" ] && [ -n "$new_ip_address" ]; then
   # Delete entries with new_host_name or new_ip_address in /etc/hosts.
-  sed -i '/Added by Google/d' /etc/hosts
-
-  # Add an entry for our new_host_name/new_ip_address in /etc/hosts.
-  echo "${new_ip_address} ${new_host_name} ${new_host_name%%.*}  # Added by Google" >> /etc/hosts
-
-  # Add an entry for reaching the metadata server in /etc/hosts.
-  echo "169.254.169.254 metadata.google.internal  # Added by Google" >> /etc/hosts
-fi
-
-# /sbin/dhclient-scripts in both ubuntu and centos have some problems for us:
-#  1) BOUND doesn't always set hostname (e.g. if old_host_name is unset in
-#     precise pangolin)
-#  2) Using too long of a FQDN as a hostname causes some tools to break in
-#     some distros (e.g. ssh-keygen) and hostname tool complains when given
-#     a FQDN that is > 64 bytes.
-#
-# As a result, we set the host name in all circumstances here, to the truncated
-# unqualified domain name.
-
-if [ -n "$new_host_name" ]; then
-  hostname "${new_host_name%%.*}"
-
-  # If NetworkManager is installed set the hostname with nmcli.
-  # to resolve issues with NetworkManager resetting the hostname
-  # to the FQDN on DHCP renew.
-  nmcli=$(which nmcli 2> /dev/null)
-  if [ -x "$nmcli" ]; then
-    nmcli general hostname "${new_host_name%%.*}"
-  fi
-
-  # Restart rsyslog to update the hostname.
-  systemctl=$(which systemctl 2> /dev/null)
-  if [ -x "$systemctl" ]; then
-    hasrsyslog=$($systemctl | grep rsyslog | cut -f1 -d' ')
-    if [ ! -z "$hasrsyslog" ]; then
-      $systemctl -q --no-block restart "$hasrsyslog"
-    fi
-  else
-    pkill -HUP syslogd
-  fi
-fi
-#!/bin/sh
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Deal with a new hostname assignment.
-
-if [ -n "$new_host_name" ] && [ -n "$new_ip_address" ]; then
-  # Delete entries with new_host_name or new_ip_address in /etc/hosts.
-  sed -i '/Added by Google/d' /etc/hosts
+  sed -i "" '/Added by Google/d' /etc/hosts
 
   # Add an entry for our new_host_name/new_ip_address in /etc/hosts.
   echo "${new_ip_address} ${new_host_name} ${new_host_name%%.*}  # Added by Google" >> /etc/hosts
 
   # Add an entry for reaching the metadata server in /etc/hosts.
   echo "169.254.169.254 metadata.google.internal  # Added by Google" >> /etc/hosts
 fi
 
 # /sbin/dhclient-scripts in both ubuntu and centos have some problems for us:
 #  1) BOUND doesn't always set hostname (e.g. if old_host_name is unset in
 #     precise pangolin)
 #  2) Using too long of a FQDN as a hostname causes some tools to break in
 #     some distros (e.g. ssh-keygen) and hostname tool complains when given
 #     a FQDN that is > 64 bytes.
 #
 # As a result, we set the host name in all circumstances here, to the truncated
 # unqualified domain name.
 
 if [ -n "$new_host_name" ]; then
   hostname "${new_host_name%%.*}"
 
   # If NetworkManager is installed set the hostname with nmcli.
   # to resolve issues with NetworkManager resetting the hostname
   # to the FQDN on DHCP renew.
   nmcli=$(which nmcli 2> /dev/null)
   if [ -x "$nmcli" ]; then
     nmcli general hostname "${new_host_name%%.*}"
   fi
 
   # Restart rsyslog to update the hostname.
   systemctl=$(which systemctl 2> /dev/null)
   if [ -x "$systemctl" ]; then
     hasrsyslog=$($systemctl | grep rsyslog | cut -f1 -d' ')
     if [ ! -z "$hasrsyslog" ]; then
       $systemctl -q --no-block restart "$hasrsyslog"
     fi
   else
     pkill -HUP syslogd
   fi
 fi