diff --git a/cgit-optflags.diff b/cgit-optflags.diff
deleted file mode 100644
index cad578b..0000000
--- a/cgit-optflags.diff
+++ /dev/null
@@ -1,16 +0,0 @@
----
- cgit.mk |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: cgit-0.11.2/cgit.mk
-===================================================================
---- cgit-0.11.2.orig/cgit.mk
-+++ cgit-0.11.2/cgit.mk
-@@ -17,6 +17,7 @@ $(CGIT_PREFIX)VERSION: force-version
- 
- # CGIT_CFLAGS is a separate variable so that we can track it separately
- # and avoid rebuilding all of Git when these variables change.
-+CGIT_CFLAGS += $(RPM_OPT_FLAGS)
- CGIT_CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
- CGIT_CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
- CGIT_CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
diff --git a/cgit.changes b/cgit.changes
index 817f17b..1151948 100644
--- a/cgit.changes
+++ b/cgit.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Dec  6 09:21:03 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
+
+- Create a /var/cache/cgit [boo#1116567]
+- Update bundled git to 2.18.1
+- Remove cgit-optflags.diff
+
 -------------------------------------------------------------------
 Sun Aug  5 16:24:56 UTC 2018 - jengelh@inai.de
 
diff --git a/cgit.spec b/cgit.spec
index f01ac7a..b2484f7 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -16,7 +16,7 @@
 #
 
 
-%define git_version	2.18.0
+%define git_version	2.18.1
 Name:           cgit
 Version:        1.2.1
 Release:        0
@@ -30,7 +30,6 @@ Source2:        https://www.kernel.org/pub/software/scm/git/git-%git_version.tar
 Source3:        https://www.kernel.org/pub/software/scm/git/git-%git_version.tar.sign
 Source4:        %name.keyring
 Source9:        cgitrc
-Patch1:         cgit-optflags.diff
 # Requirements for cgitrc man page generation
 BuildRequires:  asciidoc
 # Requirements for cgit
@@ -39,6 +38,7 @@ BuildRequires:  libxslt
 BuildRequires:  libzip-devel
 BuildRequires:  xz
 BuildRoot:      %_tmppath/%name-%version-build
+Provides:       bundled(git) = %version
 
 %description
 A web interface for the Git SCM, using a built-in cache to decrease server
@@ -46,22 +46,22 @@ I/O pressure.
 
 %prep
 %setup -qa2
-%patch -P 1 -p1
 rm -rf git
 ln -s git-%git_version git
 
 %build
 perl -i -pe 's{^#!/usr/bin/env }{#!/usr/bin/}g' filters/email-gravatar.py \
 	filters/html-converters/md2html filters/syntax-highlighting.py
-make V=1 prefix="%_prefix" %{?_smp_mflags}
+make V=1 prefix="%_prefix" CFLAGS="%optflags" %{?_smp_mflags} all
 
 %install
-%make_install install-man prefix="%_prefix" \
-	CGIT_SCRIPT_PATH="/srv/www/htdocs/cgit"
-mkdir -p "%buildroot/srv/www/cgi-bin/cgit/"
-mv %buildroot/srv/www/{htdocs,cgi-bin}/cgit/cgit.cgi
-mkdir -p "%buildroot/%_sysconfdir"
-cp %SOURCE9 "%buildroot/%_sysconfdir/cgitrc"
+%make_install V=1 prefix="%_prefix" CFLAGS="%optflags" \
+	CGIT_SCRIPT_PATH="/srv/www/htdocs/cgit" install-man
+b="%buildroot"
+mkdir -p "$b/srv/www/cgi-bin/cgit/" "$b/var/cache/cgit"
+mv $b/srv/www/htdocs/cgit/cgit.cgi $b/srv/www/cgi-bin/cgit/cgit.cgi
+mkdir -p "$b/%_sysconfdir"
+cp "%_sourcedir/cgitrc" "$b/%_sysconfdir/"
 
 %files
 %defattr(-,root,root)
@@ -70,6 +70,7 @@ cp %SOURCE9 "%buildroot/%_sysconfdir/cgitrc"
 /srv/www/cgi-bin/cgit/
 /srv/www/htdocs/cgit/
 %_prefix/lib/cgit/
+%attr(0750,wwwrun,www) /var/cache/cgit/
 %config(noreplace) %_sysconfdir/cgitrc
 
 %changelog
diff --git a/git-2.18.0.tar.sign b/git-2.18.0.tar.sign
deleted file mode 100644
index d51b1f9..0000000
Binary files a/git-2.18.0.tar.sign and /dev/null differ
diff --git a/git-2.18.0.tar.xz b/git-2.18.0.tar.xz
deleted file mode 100644
index cac1dc7..0000000
--- a/git-2.18.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92
-size 5102264
diff --git a/git-2.18.1.tar.sign b/git-2.18.1.tar.sign
new file mode 100644
index 0000000..8686e4c
Binary files /dev/null and b/git-2.18.1.tar.sign differ
diff --git a/git-2.18.1.tar.xz b/git-2.18.1.tar.xz
new file mode 100644
index 0000000..081e0d9
--- /dev/null
+++ b/git-2.18.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:888504a45cb70a002258374b3add9b5cdc044c35edd5976ab8bbeec4800898b6
+size 5102812