diff --git a/git-daemon.init b/git-daemon.init
index 2bb8644..d1233a1 100644
--- a/git-daemon.init
+++ b/git-daemon.init
@@ -69,6 +69,7 @@ rc_reset
 case "$1" in
     start)
 	echo -n "Starting git-daemon "
+	export HOME="$GIT_DAEMON_BASE_PATH"
 	/sbin/startproc -p $pidfile $git_daemon \
 		--syslog \
 		--detach \
diff --git a/git.changes b/git.changes
index 2537518..b4f3f4d 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Apr  3 12:58:06 CEST 2013 - tiwai@suse.de
+
+- Add missing $HOME for git-daemon script that may result in a
+  fatal error at start (bnc#812893)
+
+-------------------------------------------------------------------
+Thu Mar 28 13:10:15 UTC 2013 - jengelh@inai.de
+
+- Enable PCRE and make it possible to use the
+  "grep.patternType=perl" config option
+
 -------------------------------------------------------------------
 Wed Mar 27 22:42:15 UTC 2013 - lchiquitto@suse.com
 
diff --git a/git.spec b/git.spec
index 34b1b18..1e463db 100644
--- a/git.spec
+++ b/git.spec
@@ -20,22 +20,13 @@
 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
 
 Name:           git
-BuildRequires:  asciidoc
-BuildRequires:  curl
-BuildRequires:  fdupes
-BuildRequires:  libcurl-devel
-BuildRequires:  libexpat-devel
-BuildRequires:  libopenssl-devel
-BuildRequires:  perl-Error
-BuildRequires:  python
-BuildRequires:  sgml-skel
-BuildRequires:  xmlto
 Version:        1.8.2
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0
 Group:          Development/Tools/Version Control
 Url:            http://git-scm.com
+
 Source0:        http://git-core.googlecode.com/files/%name-%{version}.tar.gz
 Source1:        apache2-gitweb.conf
 Source2:        sysconfig.git-daemon
@@ -50,6 +41,17 @@ Patch4:         git-prevent_xss-default.diff
 # fix broken bash copmletion with colored egrep (bnc#779536)
 Patch5:         git-bash-completion-egrep-color-fix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  asciidoc
+BuildRequires:  curl
+BuildRequires:  fdupes
+BuildRequires:  libcurl-devel
+BuildRequires:  libexpat-devel
+BuildRequires:  libopenssl-devel
+BuildRequires:  pcre-devel
+BuildRequires:  perl-Error
+BuildRequires:  python
+BuildRequires:  sgml-skel
+BuildRequires:  xmlto
 Requires:       git-core = %{version}
 Recommends:     git-svn git-cvs git-email gitk git-gui git-web
 Suggests:       git-daemon
@@ -133,6 +135,7 @@ PreReq:         /usr/sbin/useradd %fillup_prereq %insserv_prereq
 A really simple TCP git daemon. In the default configuration it allows
 read only access to repositories in /srv/git/ that contain the
 'git-daemon-export-ok' file.
+
 %package -n gitk
 Summary:        Git revision tree visualiser
 Group:          Development/Tools/Version Control
@@ -203,6 +206,7 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
        DESTDIR=$RPM_BUILD_ROOT \
        NO_CROSS_DIRECTORY_HARDLINKS=1 \
        NO_INSTALL_HARDLINKS=1 \
+       USE_LIBPCRE=1 \
        V=1 \
        prefix=%{_prefix} mandir=%{_mandir} \
        gitexecdir=%{gitexecdir} \