diff --git a/.cvsignore b/.cvsignore
index a207bc3..2d1e83e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-sparse-0.3.tar.bz2
+sparse-0.4.tar.bz2
diff --git a/Makefile b/Makefile
index 8879455..f0aaf36 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
 # Makefile for source rpm: sparse
 # $Id$
 NAME := sparse
-SPECFILE = $(firstword $(wildcard *.spec))
+SPECFILE = $(NAME).spec
+
+UPSTREAM_CHECKS := sign
 
 define find-makefile-common
 for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
diff --git a/mirrors b/mirrors
new file mode 100644
index 0000000..dd8daca
--- /dev/null
+++ b/mirrors
@@ -0,0 +1 @@
+http://www.kernel.org/pub/software/devel/sparse/dist/
diff --git a/sources b/sources
index e99c12b..e272a24 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a54daf167fad7faedded8ec84db2dba  sparse-0.3.tar.bz2
+1de29f09434f45ce023f5f3993a6eca2  sparse-0.4.tar.bz2
diff --git a/sparse-0.4.tar.bz2.sign b/sparse-0.4.tar.bz2.sign
new file mode 100644
index 0000000..df8edfd
--- /dev/null
+++ b/sparse-0.4.tar.bz2.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBG7Dp5yGugalF9Dw4RAtTDAKCJk6i+0JDPJnGJFIw0eNkGgbOY2wCdE3On
+7oJIq6jlD30pEluSG525WrE=
+=TSsn
+-----END PGP SIGNATURE-----
diff --git a/sparse.spec b/sparse.spec
index 3a115ab..02a842e 100644
--- a/sparse.spec
+++ b/sparse.spec
@@ -1,13 +1,15 @@
 Name: sparse
-Version: 0.3
-Release: 2%{?dist}
+Version: 0.4
+Release: 1%{?dist}
 Summary:    A semantic parser of source files
 Group:      Development/Tools
 License:    OSL 1.1
-URL:        http://kernel.org/pub/software/devel/sparse/
-Source0:    http://kernel.org/pub/software/devel/sparse/dist/sparse-%{version}.tar.bz2
+URL:        http://www.kernel.org/pub/software/devel/sparse/
+Source0:    http://www.kernel.org/pub/software/devel/sparse/dist/sparse-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: libxml2-devel
+
 %description
 Sparse is a semantic parser of source files: it's neither a compiler
 (although it could be used as a front-end for one) nor is it a
@@ -61,6 +63,8 @@ rm -rf %{buildroot}
 %doc LICENSE README FAQ
 %{_bindir}/sparse
 %{_bindir}/cgcc
+%{_bindir}/c2xml
+%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -71,6 +75,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Nov  1 2007 Roland McGrath <roland@redhat.com> - 0.4-1
+- Upgrade to 0.4
+- Install man pages, c2xml.
+
 * Tue Aug 28 2007 Roland McGrath <roland@redhat.com> - 0.3-2
 - Canonicalize License: tag.
 
diff --git a/upstream b/upstream
new file mode 100644
index 0000000..2d1e83e
--- /dev/null
+++ b/upstream
@@ -0,0 +1 @@
+sparse-0.4.tar.bz2
diff --git a/upstream-key.gpg b/upstream-key.gpg
new file mode 100644
index 0000000..81cd947
--- /dev/null
+++ b/upstream-key.gpg
@@ -0,0 +1,54 @@
+pub  1024D/517D0F0E 2000-10-10 Linux Kernel Archives Verification Key <ftpadmin@kernel.org>
+     Key fingerprint = C75D C40A 11D7 AF88 9981  ED5B C86B A06A 517D 0F0E
+sub  4096g/E50A8F2A 2000-10-10
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.0.3 (GNU/Linux)
+Comment: For info see http://www.gnupg.org
+
+mQGiBDnirDkRBADCTL/iUTeZKb0tiAcKdZdsUP/KSnrGGjlinolUAsUC0D6/hUB1
+RdCpJOOERTIEr1yvehqDM7veRhNMoxJNQxa/sSrkywey5qc8uaskUNEqenimq/70
+bahWJeoWXjad68mQFh65lULnHQrrioeJnh9UpyGJppNb/yIjdnymH9aYEwCglgP7
+UegBzH22h8NVQEK2PWWbyUUD/jQA4lI0wRWcL9HpkYkHcH0LTKRB9zYpQYtyvzJi
+yTGwJyFMfYNXy0RT11dICeLkf3HMR84hkPERKMhALobLxVUbfc7j2AygmzGphWGy
+DH/xjptQP/zrsq87ylYRONK18w1J42cm+yZa4XThMDPJMrb9/l8qnxU1JnW7W1al
+HKTpBACbs+91KLqrnIGcF44TMwxgUj5CUrayPoEnLU+ZMBqfSjmu8RqEYmTxJCKv
+7erBFSuazBGj5X7twunrtrW3bxO63MbLbHjfXSRrMnKOb8dRULIg6eWAnoAx8VVZ
+YjrOpwAntU3WxYOpbiCHt9kLbb+N5rvNtFcmOqRRQaCIUFOOaLQ8TGludXggS2Vy
+bmVsIEFyY2hpdmVzIFZlcmlmaWNhdGlvbiBLZXkgPGZ0cGFkbWluQGtlcm5lbC5v
+cmc+iFUEExECABUFAjnirDkDCwoDAxUDAgMWAgECF4AACgkQyGugalF9Dw4MNACe
+JiQTyCmQzPGou2cl/RyOXj79kYYAnAsT6xt72hp/PFiywYM9vBsDVv9niQEVAwUQ
+OeKwNWx5eAAqlgcFAQEdZgf/Vn2dMKrn8021NhavP0uA3pHGRmdKQ2WJBdLiN2tv
+LkpAioZtho+op+xBz8j1zdIJQ/7XWko869KHge2BAFwA8rWDzjtaAWdE0Jo/NiAR
+epUwV2FdRRwSxIcNG2CCPyJnfPokRqjdl2z9k2PkwidHSq+2k6JxCWnOcIXChSKf
+kHnemtA65ixAlhuxvyN3MPuYs1jAHyDGcyMfomp1qH9tXFQhhyXRrG2eMAfslstC
+XGXLcoLN3O2BMR/fG2GlV6kOqGOvoMIW3clVeQLQ9B1yyekKiVY6Vg+CgK5qhg8z
+9tjH4f33zzNDwsx1WSCOU/1LIPzFBNbR9QtTF2XmOUfRs4hGBBARAgAGBQI54rBc
+AAoJEH2d7s4ry8YhmjsAoMUW9RxfXBSos0A6LwGd+5pXv/MRAKCYFLG2T4GSV+qf
+iRsXnrgDHQHD04hGBBARAgAGBQI54rOZAAoJEPKlddweGoeC/+sAoL5f7JF21mRe
+Z8VV4nhh7prm+idSAKCMXDWW/tBOeJDYpiEhgyGSGgJJWrkEDQQ54q+cEBAAjRmb
+txamcZ9EYsQTnQvVL2l6vY5Rnbc1JDdcyHEV1kH5OwZWqvckL4QgKKBbTQwyB9pC
+o0nGK4PkBbrwL0outfHQ5jl9DUzTKIu+asWUyf3fxfUV6j2A6BMo59KNnJzUyJ2+
+B5na6NN8nEqEtmogROtjT8LkOvYwqD4A/5re2vwtie+h5yU6A+JbyGQF6lFxThZj
+4WGctBgCcDBqRkPAG8DFFAdeN5SMAArktCYuUGXi2q88EDoOs3Ykw0kB8+ZFECz/
+4/b93so5Wt2hC15cxAJoXFfR3mXHm40EHzMdEublWV4blB2KvFocQC74/H74QPUk
+cWlc6EhPodKvcuOfTimDxXaiGNFONUPgNAmCXeVoOapdWpb3x7iOHPwSaXeJSrO9
+fc4GtVjDv90DT2ekK7cvYk8s6B3t7p7W21Xi+hRgrw63B3HElr01gdMZY5XA5ey/
+WmnyBS6LOxXlnVBE+2uSQ+aZHqrLpXcRvq2ZonOziDSE0i940ZvIwlSzn0U5BQWl
+9hBDQw78RacYqaFvlpcGiPj75bScB4eemxV6Wdo9mtK0Vrr+9bWScXHEv7did4X+
+7tBWKbA8M+g290OSzjeQBGLuPmbjxzEKH9jcUumzBzzC5x5GFh7On9TLXQ4K/oRT
+6QQpS93YrTVbR60G4MKsePWLJmg7IgYUtNdLGjsAAwUP/0aAAq8CmWtourj1XxNY
+pFmOAU45d65fPWVadKyF++B+uDyRNYN7HQCqrJ7ddn0sH7OBtlE8yaBYgR0TFly9
+9+LqQO4r4IGCw2TBgA5tKnOWoPGEzvrLeoxR3SnPrKBlDvx6Rr9h3OJ9UV5u/NLh
+mCP9iN10gWCGzsWbONc6qD6PugbTur44D6s4CRK9xfliSrtG3GBHW914UKjJeB9s
+e3oc1rkmNv39kKcu33w4XVETAj4qpXnwoJvy639dfvnQt1TWFjIt20iP7m+jkT3B
+b526uJ5GuJl6r8sm5OYYRs5cLigvUzRZVgYnjjqlRRACx0WcinKK55Li2Pq4qcRV
+vSE5Tr3kTUTGxdmy113FbscrhLhesGALv3Hb7jeeWC8jviGEaHppgUumR6v0hsI1
+rZ3K8kCjFRAYV8OKtcEeMqjouArGi5dn0ClmG4lwH4SEdqC/TRNWGG+iVpWf5yCj
+9mvtvUhLtl6QjXHLrJdSGyafvqR1EQMJadFt4URvx0M7tqZIcwPUnb+7Oc+J96po
+e/EQmnm6rFnTpWz0BbY4mbJC7vUH4JyLs0nlxiKrBjaO9C1DSAKBpjqaga8dQe1Z
+kLOI2F7IWFeKV2LaMl+ZvvfWMECNcqNW2fkCuP9Fpz5K+xg21TwovVy93aWKgFL6
+06jK51oQp3fW86xXK9ZGKYqQiEYEGBECAAYFAjnir5wACgkQyGugalF9Dw5M9QCg
+hhmHalzWf8B3AVrjPrtrRHA1vlgAn3YRlU5l0V5W1iXvHXQCUHIESpgm
+=SZZb
+-----END PGP PUBLIC KEY BLOCK-----