diff --git a/cgit-0.11.2.tar.xz b/cgit-0.11.2.tar.xz
deleted file mode 100644
index a58437d..0000000
--- a/cgit-0.11.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e126e770693d7296c7eb5eb83b809410aef29870bfe8f54da072a3f4d813e3b
-size 93556
diff --git a/cgit-0.12.tar.xz b/cgit-0.12.tar.xz
new file mode 100644
index 0000000..dddd1b0
--- /dev/null
+++ b/cgit-0.12.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ee233849335a64529a01cf2b6165ed492e20268e6e2526d7a7529ef1e24a5b7
+size 85152
diff --git a/cgit.changes b/cgit.changes
index 3083196..a50b723 100644
--- a/cgit.changes
+++ b/cgit.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu Jan 14 15:25:28 UTC 2016 - jengelh@inai.de
+
+- Update to new upstream release 0.12
+* Show remote refs in branch switcher combobox.
+* Add sample post-receive hook in /contrib.
+* Add HTML escaping to filters.
+* Add "enable-follow-links" option to have the log UI
+  behave the same way as "git log --follow", as well
+  as updating the diffand commit UIs.
+* Errors are now cached under the dynamic-ttl setting.
+* Simplified filters and converters.
+* Add "enable-html-serving" to turn on serving of HTML mimetypes
+  from the /plain handler, to prevent against stored XSS.
+* /blob no longer takes a mimetype query string parameter.
+- Resolve: Reflected Cross Site Scripting & Header Injection in
+  Mimetype Query String; Stored Cross Site Scripting & Header
+  Injection in Filename Parameter; Stored Cross Site Scripting in
+  Git Repo Files; Integer Overflow resulting in Buffer Overflow
+  [boo#961916 CVE-2016-1899 CVE-2016-1900 CVE-2016-1901]
+- Update bundled git tarball to 2.7.0 (build-time requirement)
+
 -------------------------------------------------------------------
 Tue Oct  6 09:59:22 UTC 2015 - jengelh@inai.de
 
diff --git a/cgit.spec b/cgit.spec
index c025e3d..839d882 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -16,10 +16,10 @@
 #
 
 
-%define git_version	2.6.1
+%define git_version	2.7.0
 
 Name:           cgit
-Version:        0.11.2
+Version:        0.12
 Release:        0
 Summary:        A web frontend for git repositories
 Url:            http://git.zx2c4.com/cgit/
@@ -47,10 +47,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 This is an attempt to create a fast web interface for the Git SCM, using a
 builtin cache to decrease server I/O pressue.
 
-Authors:
---------
-    Lars Hjemli (hjemli@gmail.com)
-
 %prep
 %setup -qa2
 %patch0 -p1
diff --git a/git-2.6.1.tar.sign b/git-2.6.1.tar.sign
deleted file mode 100644
index 3a3105a..0000000
Binary files a/git-2.6.1.tar.sign and /dev/null differ
diff --git a/git-2.6.1.tar.xz b/git-2.6.1.tar.xz
deleted file mode 100644
index 023ac4f..0000000
--- a/git-2.6.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fc7c727745d5eb0d796a16dc7c4b999c184830110e0aeb592c788597cc8e9ccd
-size 3811268
diff --git a/git-2.7.0.tar.sign b/git-2.7.0.tar.sign
new file mode 100644
index 0000000..c386087
Binary files /dev/null and b/git-2.7.0.tar.sign differ
diff --git a/git-2.7.0.tar.xz b/git-2.7.0.tar.xz
new file mode 100644
index 0000000..a37c579
--- /dev/null
+++ b/git-2.7.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa9fb34efce9c80527152a40fbae138e83bd04a15ef9111726252259345a7b0d
+size 3861524