diff --git a/git.changes b/git.changes
index 5ebd662..438ef53 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug  6 11:50:51 CEST 2008 - anosek@suse.cz
+
+- fixed Add git xinetd.d file for ability to use yast2 (bnc#398361)
+  - created file git.xinetd to run git under xinetd daemon
+
 -------------------------------------------------------------------
 Wed Jun 25 00:03:23 CEST 2008 - dmueller@suse.de
 
diff --git a/git.spec b/git.spec
index c8da194..b8c08b1 100644
--- a/git.spec
+++ b/git.spec
@@ -2,9 +2,16 @@
 # spec file for package git (Version 1.5.6)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -14,7 +21,7 @@
 Name:           git
 BuildRequires:  asciidoc curl-devel libopenssl-devel sgml-skel xmlto
 Version:        1.5.6
-Release:        1
+Release:        38
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL v2 or later
 Group:          Development/Tools/Version Control
@@ -23,6 +30,7 @@ Source0:        http://kernel.org/pub/software/scm/git/%name-%{version}.tar.bz2
 Source1:        apache2-gitweb.conf
 Source2:        sysconfig.git-daemon
 Source3:        git-daemon.init
+Source4:        git.xinetd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       git-core = %{version} git-svn = %{version} git-cvs = %{version} 
 Requires:       git-arch = %{version} git-email = %{version} gitk = %{version}
@@ -212,6 +220,8 @@ ln -s ../../etc/init.d/git-daemon $RPM_BUILD_ROOT%{_sbindir}/rcgit-daemon
 install -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.git-daemon
 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
 ###
 (find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|daemon" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-doc-files
 (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|daemon" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
@@ -283,6 +293,7 @@ fi
 /var/adm/fillup-templates/sysconfig.git-daemon
 %{!?_without_docs: %{_mandir}/man1/*daemon*.1*}
 %{!?_without_docs: %doc Documentation/*daemon*.html }
+%config(noreplace) /etc/xinetd.d/git
 
 %files -n gitk
 %defattr(-,root,root)
@@ -311,6 +322,9 @@ fi
 /usr/share/git-web
 
 %changelog
+* Wed Aug 06 2008 anosek@suse.cz
+- fixed Add git xinetd.d file for ability to use yast2 (bnc#398361)
+  - created file git.xinetd to run git under xinetd daemon
 * Wed Jun 25 2008 dmueller@suse.de
 - update to 1.5.6:
   * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.txt
diff --git a/git.xinetd b/git.xinetd
new file mode 100644
index 0000000..45388bf
--- /dev/null
+++ b/git.xinetd
@@ -0,0 +1,15 @@
+# default: off
+# description: The git server offers access to git repositories
+service git
+{
+        socket_type     = stream
+        protocol        = tcp
+        wait            = no
+        user            = git-daemon
+        group           = nogroup
+        server          = /usr/bin/git-daemon
+        server_args     = --syslog --detach --reuseaddr --user=git-daemon --group=nogroup --pid-file=/var/run/git-daemon.pid --base-path="/srv/git"
+        type            = UNLISTED
+        port            = 9418
+        log_on_failure  += USERID
+}