diff --git a/git.spec b/git.spec
index 3a8f403..9c44a19 100644
--- a/git.spec
+++ b/git.spec
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
 Version: 	1.5.4.3
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	Core git tools
 License: 	GPLv2
 Group: 		Development/Tools
@@ -245,7 +245,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n gitweb
 %defattr(-,root,root)
 /var/www/git/
-%{_sysconfdir}/httpd/conf.d/git.conf
+%config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf
 %{!?_without_docs: %doc Documentation/*.html Documentation/howto}
 %{!?_without_docs: %doc Documentation/technical}
 
@@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Sun Feb 24 2008 Bernardo Innocenti <bernie@codewiz.org> 1.5.4.3-2
+- Do not silently overwrite /etc/httpd/conf.d/git.conf
+
 * Sat Feb 23 2008 James Bowes <jbowes@redhat.com> 1.5.4.3-1
 - git-1.5.4.3
 - Include Kristian Høgsberg's changes to rename git-core to