diff --git a/git.changes b/git.changes
index 49359c7..b68805a 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun 29 17:38:24 CEST 2011 - tiwai@suse.de
+
+- Add SuSEfirewall profile for git-daemon (bnc#628048)
+
 -------------------------------------------------------------------
 Mon Jun 27 18:15:30 CEST 2011 - tiwai@suse.de
 
diff --git a/git.spec b/git.spec
index 378bacf..55b2cb6 100644
--- a/git.spec
+++ b/git.spec
@@ -17,6 +17,7 @@
 
 
 %define gitexecdir %_libexecdir/git
+%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
 
 Name:           git
 %if 0%{?suse_version} < 1030
@@ -50,6 +51,7 @@ Source2:        sysconfig.git-daemon
 Source3:        git-daemon.init
 Source4:        git.xinetd
 Source5:        usr.share.git-web.gitweb.cgi
+Source6:        susefirewall-git-daemon
 Patch1:         git-nohardlink.diff
 Patch2:         git-python-install-fix.diff
 Patch3:         completion-wordbreaks.diff
@@ -304,6 +306,8 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.git
 install -d -m 755 $RPM_BUILD_ROOT/srv/git
 install -d -m 755 $RPM_BUILD_ROOT/etc/xinetd.d
 install -m 644 %{S:4} $RPM_BUILD_ROOT/etc/xinetd.d/git
+mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir}
+install -m 644 %{S:6} $RPM_BUILD_ROOT/%{_fwdefdir}/git-daemon
 ###
 (find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@)                   > bin-man-doc-files
 (find $RPM_BUILD_ROOT%{gitexecdir} -mindepth 1 | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@)               >> bin-man-doc-files
@@ -397,6 +401,7 @@ fi
 %{!?_without_docs: %{_mandir}/man1/*daemon*.1*}
 %{!?_without_docs: %doc Documentation/*daemon*.html }
 %config(noreplace) /etc/xinetd.d/git
+%config %{_fwdefdir}/*
 
 %files -n gitk
 %defattr(-,root,root)
diff --git a/susefirewall-git-daemon b/susefirewall-git-daemon
new file mode 100644
index 0000000..493d71a
--- /dev/null
+++ b/susefirewall-git-daemon
@@ -0,0 +1,4 @@
+## Name: git-daemon
+## Description: Open ports for git-daemon
+
+TCP="git"