diff --git a/git/.footprint b/git/.footprint
index 9a20022f4..3358a43e1 100644
--- a/git/.footprint
+++ b/git/.footprint
@@ -6,8 +6,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/git-am
 -rwxr-xr-x	root/root	usr/bin/git-annotate
 -rwxr-xr-x	root/root	usr/bin/git-apply
--rwxr-xr-x	root/root	usr/bin/git-applymbox
--rwxr-xr-x	root/root	usr/bin/git-applypatch
 -rwxr-xr-x	root/root	usr/bin/git-archimport
 -rwxr-xr-x	root/root	usr/bin/git-archive
 -rwxr-xr-x	root/root	usr/bin/git-bisect
@@ -42,6 +40,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/git-fetch
 -rwxr-xr-x	root/root	usr/bin/git-fetch--tool
 -rwxr-xr-x	root/root	usr/bin/git-fetch-pack
+-rwxr-xr-x	root/root	usr/bin/git-filter-branch
 -rwxr-xr-x	root/root	usr/bin/git-fmt-merge-msg
 -rwxr-xr-x	root/root	usr/bin/git-for-each-ref
 -rwxr-xr-x	root/root	usr/bin/git-format-patch
@@ -97,6 +96,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/git-quiltimport
 -rwxr-xr-x	root/root	usr/bin/git-read-tree
 -rwxr-xr-x	root/root	usr/bin/git-rebase
+-rwxr-xr-x	root/root	usr/bin/git-rebase--interactive
 -rwxr-xr-x	root/root	usr/bin/git-receive-pack
 -rwxr-xr-x	root/root	usr/bin/git-reflog
 -rwxr-xr-x	root/root	usr/bin/git-relink
@@ -124,8 +124,10 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/git-ssh-pull
 -rwxr-xr-x	root/root	usr/bin/git-ssh-push
 -rwxr-xr-x	root/root	usr/bin/git-ssh-upload
+-rwxr-xr-x	root/root	usr/bin/git-stash
 -rwxr-xr-x	root/root	usr/bin/git-status
 -rwxr-xr-x	root/root	usr/bin/git-stripspace
+-rwxr-xr-x	root/root	usr/bin/git-submodule
 -rwxr-xr-x	root/root	usr/bin/git-svn
 -rwxr-xr-x	root/root	usr/bin/git-svnimport
 -rwxr-xr-x	root/root	usr/bin/git-symbolic-ref
@@ -161,8 +163,6 @@ drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/git-am.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-annotate.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-apply.1.gz
--rw-r--r--	root/root	usr/man/man1/git-applymbox.1.gz
--rw-r--r--	root/root	usr/man/man1/git-applypatch.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-archimport.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-archive.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-bisect.1.gz
@@ -176,6 +176,7 @@ drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/git-checkout.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-cherry-pick.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-cherry.1.gz
+-rw-r--r--	root/root	usr/man/man1/git-citool.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-clean.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-clone.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-commit-tree.1.gz
@@ -195,6 +196,7 @@ drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/git-fast-import.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-fetch-pack.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-fetch.1.gz
+-rw-r--r--	root/root	usr/man/man1/git-filter-branch.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-fmt-merge-msg.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-for-each-ref.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-format-patch.1.gz
@@ -203,6 +205,7 @@ drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/git-gc.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-get-tar-commit-id.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-grep.1.gz
+-rw-r--r--	root/root	usr/man/man1/git-gui.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-hash-object.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-http-fetch.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-http-push.1.gz
@@ -230,7 +233,6 @@ drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/git-mktree.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-mv.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-name-rev.1.gz
--rw-r--r--	root/root	usr/man/man1/git-p4import.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-pack-objects.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-pack-redundant.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-pack-refs.1.gz
@@ -269,8 +271,10 @@ drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/git-show.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-ssh-fetch.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-ssh-upload.1.gz
+-rw-r--r--	root/root	usr/man/man1/git-stash.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-status.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-stripspace.1.gz
+-rw-r--r--	root/root	usr/man/man1/git-submodule.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-svn.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-svnimport.1.gz
 -rw-r--r--	root/root	usr/man/man1/git-symbolic-ref.1.gz
@@ -295,6 +299,7 @@ drwxr-xr-x	root/root	usr/man/man3/
 drwxr-xr-x	root/root	usr/man/man5/
 -rw-r--r--	root/root	usr/man/man5/gitattributes.5.gz
 -rw-r--r--	root/root	usr/man/man5/gitignore.5.gz
+-rw-r--r--	root/root	usr/man/man5/gitmodules.5.gz
 drwxr-xr-x	root/root	usr/man/man7/
 -rw-r--r--	root/root	usr/man/man7/git.7.gz
 drwxr-xr-x	root/root	usr/share/
@@ -318,17 +323,26 @@ drwxr-xr-x	root/root	usr/share/git-gui/
 drwxr-xr-x	root/root	usr/share/git-gui/lib/
 -rw-r--r--	root/root	usr/share/git-gui/lib/blame.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/branch.tcl
+-rw-r--r--	root/root	usr/share/git-gui/lib/branch_checkout.tcl
+-rw-r--r--	root/root	usr/share/git-gui/lib/branch_create.tcl
+-rw-r--r--	root/root	usr/share/git-gui/lib/branch_delete.tcl
+-rw-r--r--	root/root	usr/share/git-gui/lib/branch_rename.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/browser.tcl
+-rw-r--r--	root/root	usr/share/git-gui/lib/checkout_op.tcl
+-rw-r--r--	root/root	usr/share/git-gui/lib/choose_rev.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/class.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/commit.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/console.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/database.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/diff.tcl
+-rw-r--r--	root/root	usr/share/git-gui/lib/encoding.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/error.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/index.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/merge.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/option.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/remote.tcl
+-rw-r--r--	root/root	usr/share/git-gui/lib/remote_branch_delete.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/shortcut.tcl
+-rw-r--r--	root/root	usr/share/git-gui/lib/status_bar.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/tclIndex
 -rw-r--r--	root/root	usr/share/git-gui/lib/transport.tcl
diff --git a/git/.md5sum b/git/.md5sum
index 4b77771b6..83d456ab8 100644
--- a/git/.md5sum
+++ b/git/.md5sum
@@ -1,2 +1,2 @@
-34b37c1c51ffbfc54069a5b2487f3c29  git-1.5.2.5.tar.bz2
-5d825f9f0dd0d66c852445fa4794f4be  git-manpages-1.5.2.5.tar.bz2
+798e5784670e0a3e0daaea048e60851d  git-1.5.3.tar.bz2
+75455aa9f4a1c54330e5c16d02095295  git-manpages-1.5.3.tar.bz2
diff --git a/git/Pkgfile b/git/Pkgfile
index 69725cb31..ad72b9ade 100644
--- a/git/Pkgfile
+++ b/git/Pkgfile
@@ -5,7 +5,7 @@
 # Nice to have: tk
 
 name=git
-version=1.5.2.5
+version=1.5.3
 release=1
 source=(http://www.kernel.org/pub/software/scm/$name/$name-{,manpages-}$version.tar.bz2)
 
@@ -25,6 +25,11 @@ build() {
 		install -m 644 $i/* $PKG/usr/man/$i;
 	done
 
+	install -d $PKG/usr/man/man3
+	mv $PKG/usr/share/man/man3/{Git,private-Error}.3pm \
+		$PKG/usr/man/man3/
+	rmdir $PKG/usr/share/{man/man3,man}
+
 	find $PKG -name perllocal.pod -delete
 	find $PKG -name .packlist -delete
 }