diff --git a/asciidoc.diff b/asciidoc.diff
deleted file mode 100644
index 0c09f75..0000000
--- a/asciidoc.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- git-1.6.0.4/Documentation/asciidoc.conf
-+++ git-1.6.0.4/Documentation/asciidoc.conf
-@@ -24,7 +24,7 @@ ifdef::backend-docbook[]
- endif::backend-docbook[]
- 
- ifdef::backend-docbook[]
--ifndef::docbook-xsl-172[]
-+ifdef::docbook-xsl-168[]
- # "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
- # v1.72 breaks with this because it replaces dots not in roff requests.
- [listingblock]
-@@ -39,9 +39,9 @@ ifdef::doctype-manpage[]
- endif::doctype-manpage[]
- </literallayout>
- {title#}</example>
--endif::docbook-xsl-172[]
-+endif::docbook-xsl-168[]
- 
--ifdef::docbook-xsl-172[]
-+ifndef::docbook-xsl-168[]
- ifdef::doctype-manpage[]
- # The following two small workarounds insert a simple paragraph after screen
- [listingblock]
-@@ -59,7 +59,7 @@ ifdef::doctype-manpage[]
- </literallayout><simpara></simpara>
- {title#}</para></formalpara>
- endif::doctype-manpage[]
--endif::docbook-xsl-172[]
-+endif::docbook-xsl-168[]
- endif::backend-docbook[]
- 
- ifdef::doctype-manpage[]
diff --git a/git-1.6.2.4.tar.bz2 b/git-1.6.2.4.tar.bz2
deleted file mode 100644
index f82fd5f..0000000
--- a/git-1.6.2.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f33a25798452a637740a65591608777e876cc6774162c50ace3822c0532a10f
-size 2019308
diff --git a/git-1.6.3.tar.bz2 b/git-1.6.3.tar.bz2
new file mode 100644
index 0000000..9891501
--- /dev/null
+++ b/git-1.6.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c28afd152d3f254be884c288a0d8de9a72de9af5d7fac3f2df43b096b103cdc
+size 2057039
diff --git a/git.changes b/git.changes
index e90a9ee..4bd74fe 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri May  8 11:37:26 CEST 2009 - tiwai@suse.de
+
+- updated to 1.6.3:
+  * major version update: git push behavior change, 
+    With the next major release, "git push" into a branch that is
+    currently checked out will be refused by default.  You can
+    choose what should happen upon such a push by setting the
+    configuration
+  * Detailed changelog found at
+    http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.3.txt
+
 -------------------------------------------------------------------
 Mon Apr 20 12:44:42 CEST 2009 - tiwai@suse.de
 
@@ -236,6 +248,11 @@ Wed Dec 17 09:35:17 CET 2008 - tiwai@suse.de
 - Fix VUL-0 Possible gitweb vulnerability: calling "git diff"
   [bnc#459664]
 
+-------------------------------------------------------------------
+Thu Dec 11 01:57:33 CET 2008 - pbaudis@suse.cz
+
+- Fix the git.xinetd daemon call [bnc#450508]
+
 -------------------------------------------------------------------
 Wed Nov 19 08:54:41 CET 2008 - tiwai@suse.de
 
diff --git a/git.spec b/git.spec
index 73e37ec..1cffc1e 100644
--- a/git.spec
+++ b/git.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package git (Version 1.6.2.4)
+# spec file for package git (Version 1.6.3)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -36,7 +36,7 @@ BuildRequires:  libopenssl-devel
 %endif
 BuildRequires:  sgml-skel
 BuildRequires:  xmlto
-Version:        1.6.2.4
+Version:        1.6.3
 Release:        1
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL v2 or later
@@ -48,7 +48,6 @@ Source2:        sysconfig.git-daemon
 Source3:        git-daemon.init
 Source4:        git.xinetd
 Source5:        usr.share.git-web.gitweb.cgi
-Patch:          asciidoc.diff
 Patch3:         git-nohardlink.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       git-core = %{version}
@@ -244,7 +243,6 @@ Authors:
 
 %prep
 %setup -q
-%patch -p1
 %patch3 -p1
 
 %build
@@ -420,6 +418,15 @@ fi
 /etc/bash_completion.d/git.sh
 
 %changelog
+* Fri May 08 2009 tiwai@suse.de
+- updated to 1.6.3:
+  * major version update: git push behavior change,
+  With the next major release, "git push" into a branch that is
+  currently checked out will be refused by default.  You can
+  choose what should happen upon such a push by setting the
+  configuration
+  * Detailed changelog found at
+  http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.3.txt
 * Mon Apr 20 2009 tiwai@suse.de
 - updated to 1.6.2.4:
   * The configuration parser had a buffer overflow while parsing
@@ -625,6 +632,8 @@ fi
 * Wed Dec 17 2008 tiwai@suse.de
 - Fix VUL-0 Possible gitweb vulnerability: calling "git diff"
   [bnc#459664]
+* Thu Dec 11 2008 pbaudis@suse.cz
+- Fix the git.xinetd daemon call [bnc#450508]
 * Wed Nov 19 2008 tiwai@suse.de
 - install git-shell and git-cvsserver as in the upstream
   (bnc#446049)
diff --git a/git.xinetd b/git.xinetd
index bb7d02b..7932124 100644
--- a/git.xinetd
+++ b/git.xinetd
@@ -8,7 +8,7 @@ service git
         user            = git-daemon
         group           = nogroup
         server          = /usr/bin/git
-        server_args     = daemon --syslog --detach --reuseaddr --user=git-daemon --group=nogroup --pid-file=/var/run/git-daemon.pid --base-path="/srv/git"
+        server_args     = daemon --syslog --inetd --base-path="/srv/git"
         type            = UNLISTED
         port            = 9418
         log_on_failure  += USERID