diff -ruN google-compute-engine-oslogin-1.1.2/Makefile google-compute-engine-oslogin-1.1.5/Makefile
--- google-compute-engine-oslogin-1.1.2/Makefile	2018-03-26 08:06:11.581543000 +0000
+++ google-compute-engine-oslogin-1.1.5/Makefile	2018-03-26 08:02:42.322843000 +0000
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	google-compute-engine-oslogin
-DISTVERSION=	1.1.2
+DISTVERSION=	1.1.5
 CATEGORIES=	sysutils
 
 MAINTAINER=	helen.koike@collabora.com
@@ -21,7 +21,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	GoogleCloudPlatform
 GH_PROJECT=	compute-image-packages
-GH_TAGNAME=	20171213
+GH_TAGNAME=	20180227
 MAKE_ARGS=	JSON_INCLUDE_PATH=${LOCALBASE}/include/json-c \
 		BIN_INSTALL_PATH=/bin \
 		PAM_INSTALL_PATH=/lib \
diff -ruN google-compute-engine-oslogin-1.1.2/distinfo google-compute-engine-oslogin-1.1.5/distinfo
--- google-compute-engine-oslogin-1.1.2/distinfo	2018-03-26 08:06:11.581624000 +0000
+++ google-compute-engine-oslogin-1.1.5/distinfo	2018-03-26 08:02:42.322961000 +0000
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514471176
-SHA256 (GoogleCloudPlatform-compute-image-packages-1.1.2-20171213_GH0.tar.gz) = 483d97c6d64cd7d9002247db63af8cb591e526a09ce52fd8d545c66da3ebb181
-SIZE (GoogleCloudPlatform-compute-image-packages-1.1.2-20171213_GH0.tar.gz) = 131055
+TIMESTAMP = 1522046585
+SHA256 (GoogleCloudPlatform-compute-image-packages-1.1.5-20180227_GH0.tar.gz) = 80e8c8059273f76e82343993a0282c51b633ba8c8dc5a14664919ee1b9e0fbaf
+SIZE (GoogleCloudPlatform-compute-image-packages-1.1.5-20180227_GH0.tar.gz) = 135485
diff -ruN google-compute-engine-oslogin-1.1.2/files/patch-Makefile google-compute-engine-oslogin-1.1.5/files/patch-Makefile
--- google-compute-engine-oslogin-1.1.2/files/patch-Makefile	2018-03-26 08:06:11.582219000 +0000
+++ google-compute-engine-oslogin-1.1.5/files/patch-Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- Makefile.orig	2017-12-13 23:47:59 UTC
-+++ Makefile
-@@ -15,7 +15,7 @@ AUTHKEYS_INSTALL_PATH = /usr/bin
- JSON_INCLUDE_PATH = /usr/include/json-c
- INCLUDE_FLAGS = -I$(JSON_INCLUDE_PATH)
- 
--CXX = g++
-+CXX ?= g++
- CXXFLAGS += -fPIC# -Wall
- PAMFLAGS = $(LDFLAGS) $(INCLUDE_FLAGS) -shared
- NSSFLAGS = $(LDFLAGS) $(INCLUDE_FLAGS) -shared -Wl,-soname,$(NSS_LIBRARY_SONAME)
diff -ruN google-compute-engine-oslogin-1.1.2/files/patch-bin_google__oslogin__control google-compute-engine-oslogin-1.1.5/files/patch-bin_google__oslogin__control
--- google-compute-engine-oslogin-1.1.2/files/patch-bin_google__oslogin__control	2018-03-26 08:06:11.581809000 +0000
+++ google-compute-engine-oslogin-1.1.5/files/patch-bin_google__oslogin__control	2018-03-26 08:02:42.323147000 +0000
@@ -1,6 +1,6 @@
---- bin/google_oslogin_control.orig	2017-12-13 23:47:59 UTC
+--- bin/google_oslogin_control.orig	2018-02-27 22:53:04 UTC
 +++ bin/google_oslogin_control
-@@ -65,29 +65,31 @@ overwrite_file() {
+@@ -65,22 +65,24 @@ overwrite_file() {
  
  remove_from_config() {
    config=$1
@@ -30,17 +30,20 @@
  }
  
  add_to_pam_config() {
-   remove_from_config ${pam_config}
--  sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new
--  sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new
--  sed -i "/pam_loginuid.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new
-+  gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new
-+  gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new
-+  gsed -i "/session.*pam_permit.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new
+@@ -97,9 +99,9 @@ ${pam_homedir}
+ "
+     echo "${added_config}$(cat ${pam_config}.new)" > ${pam_config}.new
+   else
+-    sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new
+-    sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new
+-    sed -i "/pam_loginuid.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new
++    gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new
++    gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new
++    gsed -i "/session.*pam_permit.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new
+   fi
  }
  
- restart_service() {
-@@ -100,7 +102,7 @@ restart_service() {
+@@ -113,7 +115,7 @@ restart_service() {
      fi
    fi
    if which service > /dev/null 2>&1; then
diff -ruN google-compute-engine-oslogin-1.1.2/files/patch-nss__module_nss__oslogin.cc google-compute-engine-oslogin-1.1.5/files/patch-nss__module_nss__oslogin.cc
--- google-compute-engine-oslogin-1.1.2/files/patch-nss__module_nss__oslogin.cc	2018-03-26 08:06:11.581881000 +0000
+++ google-compute-engine-oslogin-1.1.5/files/patch-nss__module_nss__oslogin.cc	2018-03-26 08:02:42.323284000 +0000
@@ -1,4 +1,4 @@
---- nss_module/nss_oslogin.cc.orig	2017-12-13 23:47:59 UTC
+--- nss_module/nss_oslogin.cc.orig	2018-02-27 22:53:04 UTC
 +++ nss_module/nss_oslogin.cc
 @@ -16,6 +16,7 @@
  #include <errno.h>
diff -ruN google-compute-engine-oslogin-1.1.2/files/patch-pam__module_pam__oslogin__admin.cc google-compute-engine-oslogin-1.1.5/files/patch-pam__module_pam__oslogin__admin.cc
--- google-compute-engine-oslogin-1.1.2/files/patch-pam__module_pam__oslogin__admin.cc	2018-03-26 08:06:11.581956000 +0000
+++ google-compute-engine-oslogin-1.1.5/files/patch-pam__module_pam__oslogin__admin.cc	2018-03-26 08:02:42.323390000 +0000
@@ -1,4 +1,4 @@
---- pam_module/pam_oslogin_admin.cc.orig	2017-12-13 23:47:59 UTC
+--- pam_module/pam_oslogin_admin.cc.orig	2018-02-27 22:53:04 UTC
 +++ pam_module/pam_oslogin_admin.cc
 @@ -14,7 +14,6 @@
  
diff -ruN google-compute-engine-oslogin-1.1.2/files/patch-pam__module_pam__oslogin__login.cc google-compute-engine-oslogin-1.1.5/files/patch-pam__module_pam__oslogin__login.cc
--- google-compute-engine-oslogin-1.1.2/files/patch-pam__module_pam__oslogin__login.cc	2018-03-26 08:06:11.582075000 +0000
+++ google-compute-engine-oslogin-1.1.5/files/patch-pam__module_pam__oslogin__login.cc	2018-03-26 08:02:42.323498000 +0000
@@ -1,4 +1,4 @@
---- pam_module/pam_oslogin_login.cc.orig	2017-12-13 23:47:59 UTC
+--- pam_module/pam_oslogin_login.cc.orig	2018-02-27 22:53:04 UTC
 +++ pam_module/pam_oslogin_login.cc
 @@ -14,7 +14,6 @@
  
diff -ruN google-compute-engine-oslogin-1.1.2/files/patch-utils_oslogin__utils.cc google-compute-engine-oslogin-1.1.5/files/patch-utils_oslogin__utils.cc
--- google-compute-engine-oslogin-1.1.2/files/patch-utils_oslogin__utils.cc	2018-03-26 08:06:11.582151000 +0000
+++ google-compute-engine-oslogin-1.1.5/files/patch-utils_oslogin__utils.cc	2018-03-26 08:02:42.323597000 +0000
@@ -1,6 +1,6 @@
---- utils/oslogin_utils.cc.orig	2017-12-13 23:47:59 UTC
+--- utils/oslogin_utils.cc.orig	2018-02-27 22:53:04 UTC
 +++ utils/oslogin_utils.cc
-@@ -218,7 +218,14 @@ bool ValidatePasswd(struct passwd* resul
+@@ -222,7 +222,14 @@ bool ValidatePasswd(struct passwd* resul
      }
    }
    if (strlen(result->pw_shell) == 0) {