diff --git a/0002-Fix-apache-path-to-modules.patch b/0002-Fix-apache-path-to-modules.patch
new file mode 100644
index 0000000..b5e574b
--- /dev/null
+++ b/0002-Fix-apache-path-to-modules.patch
@@ -0,0 +1,35 @@
+From 35b8dc7939e8af251647f96cc5d4dc8b8edfb171 Mon Sep 17 00:00:00 2001
+From: Sebastian Kisela <skisela@redhat.com>
+Date: Mon, 16 Jul 2018 19:11:10 +0200
+Subject: [PATCH] Fix apache path to modules
+
+Add missing unixd module necessary for running instaweb with apache.
+---
+ git-instaweb.sh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/git-instaweb.sh b/git-instaweb.sh
+index 47e38f3..94457a1 100755
+--- a/git-instaweb.sh
++++ b/git-instaweb.sh
+@@ -332,6 +332,8 @@ apache2_conf () {
+ 			module_path="/usr/lib/httpd/modules"
+ 		test -d "/usr/lib/apache2/modules" &&
+ 			module_path="/usr/lib/apache2/modules"
++		test -d "@@APACHEMODULES@@" &&
++			module_path="@@APACHEMODULES@@"
+ 	fi
+ 	bind=
+ 	test x"$local" = xtrue && bind='127.0.0.1:'
+@@ -356,7 +358,7 @@ EOF
+ 			break
+ 		fi
+ 	done
+-	for mod in mime dir env log_config authz_core
++	for mod in mime dir env log_config authz_core unixd
+ 	do
+ 		if test -e $module_path/mod_${mod}.so
+ 		then
+-- 
+2.14.4
+
diff --git a/git.spec b/git.spec
index c172b09..a38f59f 100644
--- a/git.spec
+++ b/git.spec
@@ -83,7 +83,7 @@
 
 Name:           git
 Version:        2.18.0
-Release:        2%{?rcrev}%{?dist}.4
+Release:        2%{?rcrev}%{?dist}.5
 Summary:        Fast Version Control System
 License:        GPLv2
 URL:            https://git-scm.com/
@@ -118,6 +118,7 @@ Patch1:         git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
 # https://github.com/gitster/git/commit/f2cb01d35
 # https://public-inbox.org/git/20180601174644.13055-1-phillip.wood@talktalk.net/
 Patch2:         0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch
+Patch3:         0002-Fix-apache-path-to-modules.patch
 
 %if %{with docs}
 BuildRequires:  asciidoc >= 8.4.1
@@ -243,6 +244,7 @@ Requires:       git-p4 = %{version}-%{release}
 %endif
 Requires:       git-subtree = %{version}-%{release}
 Requires:       git-svn = %{version}-%{release}
+Requires:       git-instaweb = %{version}-%{release}
 Requires:       gitk = %{version}-%{release}
 Requires:       perl-Git = %{version}-%{release}
 %if ! %{defined perl_bootstrap}
@@ -395,6 +397,18 @@ Requires:       subversion
 %description svn
 %{summary}.
 
+%package instaweb
+Summary:        Repository browser in gitweb
+Group:          Development/Tools
+# to get the definition of _httpd_moddir
+BuildRequires:  httpd-devel
+Requires:       git = %{version}-%{release}
+Requires:       gitweb = %{version}-%{release}
+Requires:       lighttpd or (httpd and mod_ssl)
+
+%description instaweb
+A simple script to set up gitweb and a web server for browsing the local repository.
+
 %prep
 # Verify GPG signatures
 gpghome="$(mktemp -qd)" # Ensure we don't use any existing gpg keyrings
@@ -568,7 +582,7 @@ find %{buildroot}{%{_bindir},%{gitexecdir}} \( -type f -o -type l \) -name 'git-
 find %{buildroot}{%{_bindir},%{gitexecdir}} -type f -name '*p4*' -exec rm -f {} ';'
 %endif
 
-exclude_re="archimport|email|git-(citool|cvs|daemon|gui|p4|subtree|(remote-test)?svn)|gitk|p4merge"
+exclude_re="archimport|email|git-(citool|cvs|daemon|gui|p4|subtree|(remote-test)?svn)|gitk|p4merge|instaweb"
 (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f -o -type l | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files
 (find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files
 (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files
@@ -673,6 +687,8 @@ find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \
         | sed "s/^/\%dir /"
 } >> man-doc-files-core
 ##### #DOC
+# fix the Apache module directory
+sed -i '/@@APACHEMODULES@@/s|@@APACHEMODULES@@|%{_httpd_moddir}|' %{buildroot}%{gitexecdir}/git-instaweb
 
 %check
 %if %{with docs} && %{with linkcheck}
@@ -863,7 +879,18 @@ make test || ./print-failed-test-output
 %{?with_docs:%{_mandir}/man1/git-svn.1*}
 %{?with_docs:%{_pkgdocdir}/git-svn.html}
 
+%files instaweb
+%defattr(-,root,root)
+%{gitexecdir}/git-instaweb
+%{_pkgdocdir}/git-instaweb.txt
+%{?with_docs:%{_mandir}/man1/git-instaweb.1*}
+%{?with_docs:%{_pkgdocdir}/git-instaweb.html}
+
 %changelog
+* Mon Jul 16 2018 Sebastian Kisela <skisela@redhat.com> - 2.18.0-2.5
+- Move instaweb to separate subpackage
+- Fix apache path to modules
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.0-2.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild