diff --git a/.cvsignore b/.cvsignore
index 7e28ed4..5c4722f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-subversion-1.5.4.tar.gz
-subversion-1.5.5.tar.gz
+subversion-1.5.6.tar.gz
diff --git a/psvn-init.el b/psvn-init.el
new file mode 100644
index 0000000..cbe7cc3
--- /dev/null
+++ b/psvn-init.el
@@ -0,0 +1,3 @@
+(defalias 'svn-examine 'svn-status)
+(autoload 'svn-status "psvn" "Examine the status of Subversion working copy in
+directory DIR.")
diff --git a/sources b/sources
index dc2a16c..8fdaf29 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-8ec0a6e756c35dc3ce20abb580040924  subversion-1.5.4.tar.gz
-532c7d49b3cd33d712289a5ef03b7749  subversion-1.5.5.tar.gz
+ad81e54058e64b5d399d3eda5f8bfcd1  subversion-1.5.6.tar.gz
diff --git a/subversion-1.5.6.tar.gz.asc b/subversion-1.5.6.tar.gz.asc
new file mode 100644
index 0000000..16c9793
--- /dev/null
+++ b/subversion-1.5.6.tar.gz.asc
@@ -0,0 +1,35 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAkmlkusACgkQCwOubk4kUXwZxwCgzH29yGPMxB5BhuqTyp+VFIfv
+sb4AoMU4dPm5/zn5r0dlWzPYDJg+6Gtd
+=qPyK
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAkmlujYACgkQvJ27E9sAokgXggCgjcQYY2hTOQv4Ky83FKc0GpJG
+8IYAnA/2jIpHS/9ohEoXMRlZIAAF1qUP
+=XON9
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAkmllUYACgkQokEGqRcG/W51UwCffPPA3zPH/jqmk2MKQ/0GBIOh
+FRAAoI+aVskN69uvjfH0HgFc6B84Zhdu
+=R4LR
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAkmmA8YACgkQ9o1G+2zNQDhytQCdHF6oU24LB8ghM+MMUmuA11QD
+adQAoLi5M+wSRjxqAobuuN251mu/qe8h
+=6B4V
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (FreeBSD)
+
+iEYEABECAAYFAkmmbkYACgkQ/P1jBZgh97IwPQCbBdK0VxwR0OKeQ/oGLmIVxzEg
+hXIAmwceK3qgrCfIKqF1nx/D627vbGHP
+=Mls4
+-----END PGP SIGNATURE-----
diff --git a/subversion.spec b/subversion.spec
index ec67ec0..e61f75d 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -12,10 +12,10 @@
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Summary: Modern Version Control System designed to replace CVS
+Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.5.5
-Release: 6
+Version: 1.5.6
+Release: 1
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -23,6 +23,7 @@ Source0: http://subversion.tigris.org/tarballs/subversion-%{version}.tar.gz
 Source1: subversion.conf
 Source3: filter-requires.sh
 Source4: http://www.xsteve.at/prg/emacs/psvn.el
+Source5: psvn-init.el
 Patch2: subversion-0.20.1-deplibs.patch
 Patch3: subversion-1.5.1-rpath.patch
 Patch6: subversion-1.5.2-pie.patch
@@ -60,7 +61,7 @@ package.
 
 %package -n mod_dav_svn
 Group: System Environment/Daemons
-Summary: Apache server module for Subversion server
+Summary: Apache httpd module for Subversion server
 Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
 Requires: subversion = %{version}-%{release}
 BuildRequires: httpd-devel >= 2.0.45
@@ -181,6 +182,9 @@ for f in emacs/site-lisp xemacs/site-packages/lisp; do
   install -m 644 $RPM_SOURCE_DIR/psvn.el ${RPM_BUILD_ROOT}%{_datadir}/$f
 done
 
+install -m 644 $RPM_SOURCE_DIR/psvn-init.el \
+        ${RPM_BUILD_ROOT}%{_datadir}/%{_datadir}/emacs/site-lisp
+
 # Rename authz_svn INSTALL doc for docdir
 ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL
 
@@ -232,8 +236,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 %{python_sitearch}/svn
 %{python_sitearch}/libsvn
-%{_datadir}/emacs/site-lisp
-%{_datadir}/xemacs/site-packages/lisp
+%{_datadir}/emacs/site-lisp/*.el
+%{_datadir}/xemacs/site-packages/lisp/*.el
 %dir %{_sysconfdir}/subversion
 %exclude %{_libdir}/libsvn_swig_perl*
 %exclude %{_libdir}/libsvn_swig_ruby*
@@ -275,6 +279,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Mon Mar  9 2009 Joe Orton <jorton@redhat.com> 1.5.6-1
+- update to 1.5.6
+- autoload psvn (#238491, Tom Tromey)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/upstream b/upstream
index d211ef6..5c4722f 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-subversion-1.5.5.tar.gz
+subversion-1.5.6.tar.gz