diff --git a/git-2.15.1.tar.sign b/git-2.15.1.tar.sign
deleted file mode 100644
index c84c33f..0000000
Binary files a/git-2.15.1.tar.sign and /dev/null differ
diff --git a/git-2.15.1.tar.xz b/git-2.15.1.tar.xz
deleted file mode 100644
index a670116..0000000
--- a/git-2.15.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:999c90fd7d45066992cdb87dda35bdff6dfc1d01496118ea718dfb866da4045c
-size 4894768
diff --git a/git-2.16.0.tar.sign b/git-2.16.0.tar.sign
new file mode 100644
index 0000000..df9e951
Binary files /dev/null and b/git-2.16.0.tar.sign differ
diff --git a/git-2.16.0.tar.xz b/git-2.16.0.tar.xz
new file mode 100644
index 0000000..be37b46
--- /dev/null
+++ b/git-2.16.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d10764e66b3d650dee0d99a1c77afa4aaae5e739c0973fcc1c5b9e6516e30f8
+size 4961856
diff --git a/git-gui-tclIndex.patch b/git-gui-tclIndex.patch
deleted file mode 100644
index f84eae0..0000000
--- a/git-gui-tclIndex.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Date: Wed, 16 Nov 2016 16:46:06 -0500 (EST)
-Subject: git-gui: Sort entries in optimized tclIndex
-From: Anders Kaseorg <andersk@mit.edu>
-
-auto_mkindex expands wildcards in directory order, which depends on
-the underlying filesystem.  To improve build reproducibility, sort the
-list of *.tcl files in the Makefile.
-
-The unoptimized loading case (7 lines below) was previously fixed in
-v2.11.0-rc0~31^2^2~14 “git-gui: sort entries in tclIndex”.
-
-Signed-off-by: Anders Kaseorg <andersk@mit.edu>
-
-Index: git-2.11.0/git-gui/Makefile
-===================================================================
---- git-2.11.0.orig/git-gui/Makefile
-+++ git-2.11.0/git-gui/Makefile
-@@ -252,7 +252,7 @@ $(ALL_MSGFILES): %.msg : %.po
- lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
- 	$(QUIET_INDEX)if echo \
- 	  $(foreach p,$(PRELOAD_FILES),source $p\;) \
--	  auto_mkindex lib '*.tcl' \
-+	  auto_mkindex lib $(patsubst lib/%,%,$(sort $(ALL_LIBFILES))) \
- 	| $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \
- 	else \
- 	 echo >&2 "    * $(TCL_PATH) failed; using unoptimized loading"; \
diff --git a/git.changes b/git.changes
index f2e6797..8c0ef27 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Jan 19 02:00:31 UTC 2018 - avindra@opensuse.org
+
+- git 2.16.0:
+  * See https://raw.github.com/git/git/master/Documentation/RelNotes/2.16.0.txt
+- partial cleanup with spec-cleaner
+- drop git-gui-tclIndex.patch
+  * merged upstream in da10ea373b80cc8bf8efca5acb1d11ecf410fb0c
+
 -------------------------------------------------------------------
 Fri Dec  1 01:48:24 UTC 2017 - aavindraa@gmail.com
 
diff --git a/git.spec b/git.spec
index 5ce7f4e..a6571fb 100644
--- a/git.spec
+++ b/git.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package git
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -33,7 +33,7 @@
 %bcond_without docs
 
 Name:           git
-Version:        2.15.1
+Version:        2.16.0
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0
@@ -61,8 +61,6 @@ Patch6:         git-tcsh-completion-fixes.diff
 # adapt paths in zsh completion (bnc#853183)
 Patch7:         git-zsh-completion-fixes.diff
 Patch8:         git-asciidoc.patch
-Patch9:         git-gui-tclIndex.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  apache2
 %if %{with docs}
 BuildRequires:  asciidoc
@@ -271,16 +269,15 @@ directory /git/ that calls the cgi script.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 
 %build
 cat > .make <<'EOF'
 #!/bin/bash
-make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
+make %{_smp_mflags} CFLAGS="%{optflags}" \
        GITWEB_CONFIG="/etc/gitweb.conf" \
        GITWEB_PROJECTROOT="/srv/git" \
        WITH_OWN_SUBPROCESS_PY=YesPlease \
-       DESTDIR=$RPM_BUILD_ROOT \
+       DESTDIR=%{buildroot} \
        NO_CROSS_DIRECTORY_HARDLINKS=1 \
        NO_INSTALL_HARDLINKS=1 \
 %if 0%{?suse_version} > 1320
@@ -309,62 +306,62 @@ chmod 755 .make
 ### git-web
 cp gitweb/INSTALL INSTALL.gitweb
 cp gitweb/README README.gitweb
-install -d %{buildroot}/usr/share/git-web
+install -d %{buildroot}%{_datadir}/git-web
 install -d %{buildroot}/etc/apache2/conf.d
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d/gitweb.conf
+install -m 644 %{SOURCE1} %{buildroot}/etc/apache2/conf.d/gitweb.conf
 ### git-daemon
-install -d -m 755 $RPM_BUILD_ROOT%{_unitdir}
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_unitdir}/git-daemon.service
-install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
-ln -s /usr/sbin/service $RPM_BUILD_ROOT%{_sbindir}/rcgit-daemon
-install -d -m 755 $RPM_BUILD_ROOT%{_fillupdir}
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.git-daemon
-install -d -m 755 $RPM_BUILD_ROOT/srv/git
-install -d -m 755 $RPM_BUILD_ROOT/etc/xinetd.d
-install -m 644 %{S:4} $RPM_BUILD_ROOT/etc/xinetd.d/git
-mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir}
-install -m 644 %{S:6} $RPM_BUILD_ROOT/%{_fwdefdir}/git-daemon
+install -d -m 755 %{buildroot}%{_unitdir}
+install -m 644 %{SOURCE3} %{buildroot}/%{_unitdir}/git-daemon.service
+install -d -m 755 %{buildroot}%{_sbindir}
+ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcgit-daemon
+install -d -m 755 %{buildroot}%{_fillupdir}
+install -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.git-daemon
+install -d -m 755 %{buildroot}/srv/git
+install -d -m 755 %{buildroot}/etc/xinetd.d
+install -m 644 %{S:4} %{buildroot}/etc/xinetd.d/git
+mkdir -p %{buildroot}/%{_fwdefdir}
+install -m 644 %{S:6} %{buildroot}/%{_fwdefdir}/git-daemon
 ###
 ./.make -C contrib/subtree install
 %{!?_without_docs: ./.make -C contrib/subtree install-doc}
-(find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|p4|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@)                   > bin-man-doc-files
-(find $RPM_BUILD_ROOT%{gitexecdir} ! -type d | grep -vE "archimport|p4|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@)               >> bin-man-doc-files
-(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|p4|svn|git-cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
+(find %{buildroot}%{_bindir} -type f -o -type l | grep -vE "archimport|p4|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^%{buildroot}@@)                   > bin-man-doc-files
+(find %{buildroot}%{gitexecdir} ! -type d | grep -vE "archimport|p4|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^%{buildroot}@@)               >> bin-man-doc-files
+(find %{buildroot}%{_mandir} -type f | grep -vE "archimport|p4|svn|git-cvs|email|gitk|git-daemon|gui" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files
 ( pushd perl
   perl Makefile.PL
   make -f perl.mak DESTDIR=%{buildroot}  install_vendor
 )
 rm -rf %{buildroot}/usr/lib/perl5/site_perl
 %perl_process_packlist
-find $RPM_BUILD_ROOT/%_mandir -type f -print0 | xargs -0 chmod 644
-install -m 644 -D contrib/completion/git-completion.bash $RPM_BUILD_ROOT/etc/bash_completion.d/git.sh
-install -m 644 -D contrib/completion/git-prompt.sh $RPM_BUILD_ROOT/etc/bash_completion.d/git-prompt.sh
+find %{buildroot}/%_mandir -type f -print0 | xargs -0 chmod 644
+install -m 644 -D contrib/completion/git-completion.bash %{buildroot}/etc/bash_completion.d/git.sh
+install -m 644 -D contrib/completion/git-prompt.sh %{buildroot}/etc/bash_completion.d/git-prompt.sh
 # contrib/credential
 %if %{with git_gnome_keyring}
-install -m 755 -D contrib/credential/gnome-keyring/git-credential-gnome-keyring $RPM_BUILD_ROOT/%{gitexecdir}/git-credential-gnome-keyring
+install -m 755 -D contrib/credential/gnome-keyring/git-credential-gnome-keyring %{buildroot}/%{gitexecdir}/git-credential-gnome-keyring
 %endif
 # contrib/workdir
 install -m 755 -D contrib/workdir/git-new-workdir %{buildroot}/%{_bindir}
 # process tcsh completion
 (cd contrib/completion
- mkdir -p $RPM_BUILD_ROOT/usr/share/tcsh
+ mkdir -p %{buildroot}%{_datadir}/tcsh
  tcsh ./git-completion.tcsh
- install -m 644 -D git.csh $RPM_BUILD_ROOT/etc/profile.d/git.csh
+ install -m 644 -D git.csh %{buildroot}/etc/profile.d/git.csh
 )
 # zsh completion
-install -m 644 -D contrib/completion/git-completion.zsh $RPM_BUILD_ROOT/etc/zsh_completion.d/_git
+install -m 644 -D contrib/completion/git-completion.zsh %{buildroot}/etc/zsh_completion.d/_git
 #
 # apparmor profile for git-web
 #
-install -d -m 755 $RPM_BUILD_ROOT/etc/apparmor.d
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/apparmor.d
+install -d -m 755 %{buildroot}/etc/apparmor.d
+install -m 644 %{SOURCE5} %{buildroot}/etc/apparmor.d
 #
 # create predictable symlinks to make apparmor profile work
 for i in git git-upload-archive git-receive-pack; do
-  rm $RPM_BUILD_ROOT%{_bindir}/$i
-  ln -s %{gitexecdir}/git $RPM_BUILD_ROOT%{_bindir}/$i
+  rm %{buildroot}%{_bindir}/$i
+  ln -s %{gitexecdir}/git %{buildroot}%{_bindir}/$i
 done
-if ! test -f $RPM_BUILD_ROOT%{gitexecdir}/git-add; then
+if ! test -f %{buildroot}%{gitexecdir}/git-add; then
   echo "git-add is not a regular file, apparmor profile won't work!" >&2
   exit 1
 fi
@@ -377,16 +374,16 @@ cp -a Documentation/technical/*.txt "%buildroot/%_docdir/git/technical/"
 %{!?_without_docs: cp -a Documentation/howto/*.html "%buildroot/%_docdir/git/howto/"}
 %{!?_without_docs: cp -a Documentation/technical/*.html "%buildroot/%_docdir/git/technical/"}
 
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/applications
-install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_datadir}/applications
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%suse_update_desktop_file $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-gui.desktop
+install -d -m 755 %{buildroot}%{_datadir}/applications
+install -m 644 %{SOURCE9} %{buildroot}%{_datadir}/applications
+install -d -m 755 %{buildroot}%{_datadir}/pixmaps
+install -m 644 %{SOURCE10} %{buildroot}%{_datadir}/pixmaps
+%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}-gui.desktop
 
 %find_lang %{name}
 cat %{name}.lang >>bin-man-doc-files
 # use symlinks instead of hardlinks in sub-commands
-%fdupes -s $RPM_BUILD_ROOT
+%fdupes -s %{buildroot}
 
 %check
 ./.make %{?_smp_mflags} test
@@ -408,51 +405,42 @@ fi
 %service_del_postun git-daemon.service
 
 %files
-%defattr(-,root,root)
 %dir %_docdir/%name
 %_docdir/%name/README.md
 
 %files doc
-%defattr(-,root,root)
 %_docdir/%name/
 %exclude %_docdir/%name/README.md
 %exclude %_docdir/%name/COPYING
 
 %files svn
-%defattr(-,root,root)
 %{gitexecdir}/*svn*
 %{!?_without_docs: %{_mandir}/man1/*svn*.1*}
 
 %files cvs
-%defattr(-,root,root)
 %{_bindir}/git-cvs*
 %{gitexecdir}/*cvs*
 %{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
 
 %if %{with git_gnome_keyring}
 %files credential-gnome-keyring
-%defattr(-,root,root)
 %{gitexecdir}/git-credential-gnome-keyring
 %endif
 
 %files arch
-%defattr(-,root,root)
 %{gitexecdir}/git-archimport
 %{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
 
 %files p4
-%defattr(-,root,root)
 %{gitexecdir}/git-p4
 %{gitexecdir}/mergetools/p4merge
 %{!?_without_docs: %{_mandir}/man1/git-p4.1*}
 
 %files email
-%defattr(-,root,root)
 %{gitexecdir}/*email*
 %{!?_without_docs: %{_mandir}/man1/*email*.1*}
 
 %files daemon
-%defattr(-,root,root)
 %{gitexecdir}/git-daemon
 %{_unitdir}/git-daemon.service
 %{_sbindir}/rcgit-daemon
@@ -463,28 +451,24 @@ fi
 %config %{_fwdefdir}/*
 
 %files -n gitk
-%defattr(-,root,root)
 %{_bindir}/gitk
-/usr/share/gitk
+%{_datadir}/gitk
 %{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
 
 %files gui
-%defattr(-,root,root)
 %{gitexecdir}/git-gui*
-/usr/share/git-gui
+%{_datadir}/git-gui
 %{!?_without_docs: %{_mandir}/man1/*gui*.1*}
 %{_datadir}/applications/%{name}-gui.desktop
 %{_datadir}/pixmaps/%{name}-gui.png
 
 %files web
-%defattr(-,root,root)
 %doc README.gitweb INSTALL.gitweb
 %config(noreplace) /etc/apache2/conf.d/gitweb.conf
-/usr/share/gitweb
+%{_datadir}/gitweb
 /etc/apparmor.d
 
 %files core -f bin-man-doc-files
-%defattr(-,root,root)
 %{_datadir}/git-core/
 %dir %{gitexecdir}
 %dir %{gitexecdir}/mergetools
@@ -496,7 +480,7 @@ fi
 %{perl_vendorlib}/Git/
 %{perl_vendorarch}/auto/Git/
 /etc/bash_completion.d/*.sh
-/usr/share/tcsh
+%{_datadir}/tcsh
 /etc/profile.d/*.csh
 /etc/zsh_completion.d
 %doc %{_docdir}/%name/COPYING