diff --git a/git-2.17.1.tar.sign b/git-2.17.1.tar.sign
deleted file mode 100644
index 89d9581..0000000
Binary files a/git-2.17.1.tar.sign and /dev/null differ
diff --git a/git-2.17.1.tar.xz b/git-2.17.1.tar.xz
deleted file mode 100644
index e3d49ac..0000000
--- a/git-2.17.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79136e7aa83abae4d8a25c8111f113d3c5a63aeb5fd93cc72c26d49c6d5ba65e
-size 5015484
diff --git a/git-2.18.0.tar.sign b/git-2.18.0.tar.sign
new file mode 100644
index 0000000..d51b1f9
Binary files /dev/null and b/git-2.18.0.tar.sign differ
diff --git a/git-2.18.0.tar.xz b/git-2.18.0.tar.xz
new file mode 100644
index 0000000..cac1dc7
--- /dev/null
+++ b/git-2.18.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92
+size 5102264
diff --git a/git-bash-completion-egrep-color-fix.diff b/git-bash-completion-egrep-color-fix.diff
deleted file mode 100644
index e9b70bb..0000000
--- a/git-bash-completion-egrep-color-fix.diff
+++ /dev/null
@@ -1,17 +0,0 @@
----
- contrib/completion/git-completion.bash |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: git-2.11.0/contrib/completion/git-completion.bash
-===================================================================
---- git-2.11.0.orig/contrib/completion/git-completion.bash
-+++ git-2.11.0/contrib/completion/git-completion.bash
-@@ -627,7 +627,7 @@ __git_commands () {
- 	then
- 		printf "%s" "${GIT_TESTING_COMMAND_COMPLETION}"
- 	else
--		git help -a|egrep '^  [a-zA-Z0-9]'
-+		git help -a|egrep --color=never '^  [a-zA-Z0-9]'
- 	fi
- }
- 
diff --git a/git.changes b/git.changes
index 2f9f30b..c53986b 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Jun 25 07:40:25 UTC 2018 - astieger@suse.com
+
+- git 2.18.0:
+  * improvements to rename detection logic
+  * When built with more recent cURL, GIT_SSL_VERSION can now
+    specify "tlsv1.3" as its value.
+  * "git mergetools" learned talking to guiffy.
+  * various other workflow improvements and fixes
+  * performance improvements and other developer visible fixes
+- drop git-bash-completion-egrep-color-fix.diff no longer required
+
 -------------------------------------------------------------------
 Tue May 29 23:11:45 UTC 2018 - avindra@opensuse.org
 
diff --git a/git.spec b/git.spec
index 8bc5dab..d25db8b 100644
--- a/git.spec
+++ b/git.spec
@@ -35,7 +35,7 @@
 %bcond_without docs
 
 Name:           git
-Version:        2.17.1
+Version:        2.18.0
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only
@@ -55,8 +55,6 @@ Source10:       %{name}-gui.png
 Patch3:         completion-wordbreaks.diff
 # CVE-2011-2186, bnc#698456
 Patch4:         git-prevent_xss-default.diff
-# fix broken bash copmletion with colored egrep (bnc#779536)
-Patch5:         git-bash-completion-egrep-color-fix.diff
 # cook up tcsh completion to be installable (bnc#853183)
 Patch6:         git-tcsh-completion-fixes.diff
 # adapt paths in zsh completion (bnc#853183)
@@ -286,7 +284,6 @@ directory /git/ that calls the cgi script.
 %setup -q
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -504,6 +501,7 @@ fi
 %{_datadir}/git-core/
 %dir %{gitexecdir}
 %dir %{gitexecdir}/mergetools
+%{gitexecdir}/mergetools/guiffy
 %{_bindir}/git-new-workdir
 %if 0%{?suse_version} < 1140
 /var/adm/perl-modules/%{name}