diff --git a/cgit.changes b/cgit.changes
index 0ec9d8f..3083196 100644
--- a/cgit.changes
+++ b/cgit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct  6 09:59:22 UTC 2015 - jengelh@inai.de
+
+- Update bundled git tarball to 2.6.1 [bnc#948969]
+
 -------------------------------------------------------------------
 Thu Sep 24 14:47:29 UTC 2015 - jengelh@inai.de
 
diff --git a/cgit.spec b/cgit.spec
index 7733fa9..c025e3d 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -16,7 +16,7 @@
 #
 
 
-%define git_version	2.5.3
+%define git_version	2.6.1
 
 Name:           cgit
 Version:        0.11.2
@@ -67,8 +67,8 @@ make install install-man DESTDIR="%buildroot" prefix="%_prefix" \
 mkdir -p "%buildroot/srv/www/cgi-bin/cgit/"
 mv "%{buildroot}"/srv/www/{htdocs,cgi-bin}/cgit/cgit.cgi
 
-mkdir -p "%{buildroot}"/etc
-cp %{SOURCE9} "%{buildroot}"/etc/cgitrc
+mkdir -p "%buildroot/%_sysconfdir"
+cp %{SOURCE9} "%buildroot/%_sysconfdir/cgitrc"
 
 %files
 %defattr(-,root,root)
@@ -77,6 +77,6 @@ cp %{SOURCE9} "%{buildroot}"/etc/cgitrc
 /srv/www/cgi-bin/cgit/
 /srv/www/htdocs/cgit/
 /usr/lib/cgit/
-%config(noreplace) /etc/cgitrc
+%config(noreplace) %_sysconfdir/cgitrc
 
 %changelog
diff --git a/git-2.5.3.tar.sign b/git-2.5.3.tar.sign
deleted file mode 100644
index 1e5553a..0000000
Binary files a/git-2.5.3.tar.sign and /dev/null differ
diff --git a/git-2.5.3.tar.xz b/git-2.5.3.tar.xz
deleted file mode 100644
index b3abe4c..0000000
--- a/git-2.5.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:124d29d857a1282fd2111cf4a021f156e8bae917f455b4551b2aea87f0453a1a
-size 3745096
diff --git a/git-2.6.1.tar.sign b/git-2.6.1.tar.sign
new file mode 100644
index 0000000..3a3105a
Binary files /dev/null and b/git-2.6.1.tar.sign differ
diff --git a/git-2.6.1.tar.xz b/git-2.6.1.tar.xz
new file mode 100644
index 0000000..023ac4f
--- /dev/null
+++ b/git-2.6.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc7c727745d5eb0d796a16dc7c4b999c184830110e0aeb592c788597cc8e9ccd
+size 3811268