diff --git a/0001-Remove-env-from-shebang-in-zypper-plugin.patch b/0001-Remove-env-from-shebang-in-zypper-plugin.patch
deleted file mode 100644
index 8f5e6a8..0000000
--- a/0001-Remove-env-from-shebang-in-zypper-plugin.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 86700d49eac01eb070c4581e0729ba107370e105 Mon Sep 17 00:00:00 2001
-From: Avindra Goolcharan <aavindraa@gmail.com>
-Date: Sun, 29 Oct 2017 11:54:49 -0400
-Subject: [PATCH] Remove env from shebang in zypper plugin
-
----
- zypper-etckeeper.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/zypper-etckeeper.py b/zypper-etckeeper.py
-index daa2ff2..0b21881 100755
---- a/zypper-etckeeper.py
-+++ b/zypper-etckeeper.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- 
- import errno
- import subprocess
--- 
-2.14.3
-
diff --git a/etckeeper-1.18.7.tar.gz b/etckeeper-1.18.7.tar.gz
deleted file mode 100644
index 3c27705..0000000
--- a/etckeeper-1.18.7.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7abde0e029abd06351d0e98c067a98dd7da3a22d9627c83c95e2eb90d29066cd
-size 77568
diff --git a/etckeeper-1.18.8.tar.gz b/etckeeper-1.18.8.tar.gz
new file mode 100644
index 0000000..efc03bd
--- /dev/null
+++ b/etckeeper-1.18.8.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97ba6908399a877b749e9137b9b71ada6db1373695da1bd646c5825e7c17d08e
+size 84964
diff --git a/etckeeper.changes b/etckeeper.changes
index 30a788b..ebecb9c 100644
--- a/etckeeper.changes
+++ b/etckeeper.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Sep 11 07:34:30 UTC 2018 - ecsos@opensuse.org
+
+- update to 1.18.8:
+  * Work around git commit's lack of robustness, by providing
+    reasonable default values for GIT_COMMITTER_EMAIL etc.
+    This was already done as part of the su/sudo handling,
+    and is now always done.
+  * Don't hardcode the master branch when pushing to PUSH_REMOTE.
+    Instead, let git push whatever branches it is configured to
+    push to that remote.
+- Drop 0001-Remove-env-from-shebang-in-zypper-plugin.patch because
+  now in upstream.
+
 -------------------------------------------------------------------
 Wed Oct 18 07:35:13 UTC 2017 - aavindraa@gmail.com
 
diff --git a/etckeeper.spec b/etckeeper.spec
index b8a748a..0df2a66 100644
--- a/etckeeper.spec
+++ b/etckeeper.spec
@@ -2,7 +2,7 @@
 #
 # spec file for package etckeeper
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2014 Mitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp>
 # Copyright (c) 2013 Pascal Bleser <pascal.bleser@opensuse.org>
 #
@@ -23,16 +23,14 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 Name:           etckeeper
-Version:        1.18.7
+Version:        1.18.8
 Release:        0
 Summary:        Store /etc under Version Control
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Management
 Source:         https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/%{name}-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM etckeeper-avoid-packagelist.patch gh#joeyh/etckeeper#17 bkbin005@rinku.zaq.ne.jp -- add AVOID_PACKAGELIST
 Patch0:         etckeeper-avoid-packagelist.patch
-# PATCH-FIX-UPSTREAM 0001-Remove-env-from-shebang-in-zypper-plugin.patch
-Patch1:         0001-Remove-env-from-shebang-in-zypper-plugin.patch
 Url:            http://etckeeper.branchable.com/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define LPM rpm
@@ -112,7 +110,6 @@ The etckeeper-zypp-plugin calls etckeeper from YUM.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %__perl -pi -e '
 s|^(\s*)(HIGHLEVEL_PACKAGE_MANAGER)=.+|$1$2=%{HPM}|;