diff --git a/.cvsignore b/.cvsignore
index 4a672b3..80af4c3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,2 @@
-subversion-1.6.11.tar.bz2
-subversion-1.6.11
+subversion-1.6.12.tar.bz2
 *.rpm
diff --git a/sources b/sources
index 7be3354..707a7a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-75419159b50661092c4137449940b5cc  subversion-1.6.11.tar.bz2
+a4b1d0d7f3a4587c59da9c1acf9dedd0  subversion-1.6.12.tar.bz2
diff --git a/subversion-1.6.11.tar.bz2.asc b/subversion-1.6.11.tar.bz2.asc
deleted file mode 100644
index c93383e..0000000
--- a/subversion-1.6.11.tar.bz2.asc
+++ /dev/null
@@ -1,46 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkvHSAsACgkQCwOubk4kUXylUgCgt7Yfe9zYdXguPRUg4+HQ8RPz
-4tsAoK7obmDGY1xH7SEWYJcebyfzRMHE
-=w3+z
------END PGP SIGNATURE-----
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkvH1OIACgkQokEGqRcG/W5wtwCeLxVR1xhB5Z8MaJyrPQWSb9xu
-PwIAoIVUpr3guBYm3U1jQAag+zgetOSA
-=+XZN
------END PGP SIGNATURE-----
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkvIEjkACgkQ9o1G+2zNQDiGeACdEWGRhlRhldguMoMLmN4oUlvd
-mIUAmwUTulaW8qrzDGD+fKdz/Iyzt0H+
-=S09a
------END PGP SIGNATURE-----
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iQEcBAABCAAGBQJLyGaEAAoJEHbXiOHtGlmcLzEIAJKZZlVO9nhe2ZwUCN5yG+Du
-wUYq8DkFnHw42hnfIw2G9+SdziIJ6UmUu5tOKh6ML5ojvyNPskmHXqdKU/3cHQZ9
-nii674IptohNBAF/LSOQnLYtF5gtbjliHVLK63ql6T11v47UakmIdVNXFmUWIKc3
-86zG6sUV9VFJcglJIMbnoKwfzYfmb2S7EB6I96AErvhm6VsUhd9fvrTFy1fXGA4X
-p2aDhPWvpyaltJW4aJpRvm/ELHaGFruiffnQY1kOfExbAWOziSm16ILLGmWLnaki
-HG/5dcsdm9z2KKc+Ji2qa9V+lHBFy3Npe4L7Wx2rMm9ckJhVgf2yTnged+3lZnE=
-=Q5+A
------END PGP SIGNATURE-----
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (FreeBSD)
-
-iEYEABECAAYFAkvIigcACgkQ/P1jBZgh97LrOgCgqBuNbOjq7IgrqrZDf7tKONyu
-348AoMrl42yrscNV0aViRBFwHhj5uobH
-=MhrW
------END PGP SIGNATURE-----
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkvIjhQACgkQNR8z5DU+JbwO3QCdEtF8iNCElKY9Mxi/8phW/eBc
-T/IAn26boeHHorEfFqmDX0hAshh4/riV
-=AFkf
------END PGP SIGNATURE-----
diff --git a/subversion-1.6.12.tar.bz2.asc b/subversion-1.6.12.tar.bz2.asc
new file mode 100644
index 0000000..fae32d0
--- /dev/null
+++ b/subversion-1.6.12.tar.bz2.asc
@@ -0,0 +1,56 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iEYEABECAAYFAkwavKUACgkQCwOubk4kUXwEGwCgq4c5SrxIzAFHD7GhouIQIIRh
+VxsAn0h8GTJosXz8+fmwTcwVZ6kcXxb9
+=RjTT
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAkwbbakACgkQNR8z5DU+JbxSlACfY125bw9ZzJO238Fd6C5zOgr7
+SrIAn243aBcaBg9Q1lKPHlnKhuAHzTR2
+=MI8n
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAkwbHIoACgkQ9o1G+2zNQDj95ACeKao3zsdgFdc7z71Au+2QBaYb
+NUYAnj/yswEyiPmtiwPUj4BJOaXvYAir
+=5WOC
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQEcBAABCAAGBQJMG4FCAAoJEHbXiOHtGlmcOj8H/A0Jq9uje2XZLfIoGD0TQn6v
+4U+ymtTp1Z8EYExlyDqgYYv6Q6CcJ5jSWzMcN/XGPxOK8F29f95BT0H6KRZzNMmE
+mTKV2w44koiTFcffzI99JYHq+jwqWTA0QAfBYpvTOJ7bmZsujlvBye9x7j00ZXdD
+sZiMPI/mq9yMzs5BgdqnafYgcR0Ae5CmZzmWL5pwqag4iiN1amVp1rKH754ulKO/
+dbj/jhYexwiwaEUMc7xeDQJEr6Ou/r7ILazdc89TefREfdcN4/Py4ccnHe6xG1/a
+EY6t++Dt0yfppdJMmSWeVcxBL4e+nVOFoq1kvriRRACVMrzZpA/tNIm/iKLH2lk=
+=FgAM
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iQIcBAABAgAGBQJMHmrfAAoJEFU3/w1zlLfgsAsP/AoS+XzwSghdGzezHdcshBYu
+SEhTKUKCbd4qC6ItZV/pdg4wmsiP8GQsJSyUq+6MJ+FSy5JK1pMJ5T23oVncZX1G
+4YI1o42+iI4UmyLatBgflLsf5QFBGLIsNdUX9228PwL9i99CTYIGozPGy+y5DCX2
+xOEUpa/sxFGq7wVJZ8JxOuQ/8sWlhEBB+zB+/qP/MGsBkriXkIt2g2CuK0WoI2+o
+1p74hNpB5HB7COC27dRDqDZkUGUH+WSGP2941BdBEWmR6qwHlGOsKRW2hUGbLcuR
+14nGMOfNliVvyixSrdno6ZycNIDrfkUfDBryQ8kWy5pVeXgqNs3uR2aPSqX2lSwg
+UYVW6P+hg01A3YX5AFikh8Zv5aKa08y5b/jUFzvnVsFJwzQIjI+7N1hhmYDH9rM/
+5meTfC6QoMFJDpg40jWesKQxfYRyPpvISCWZ7nFp03KV+eRnVncJtmuHzQ8f+c1c
+yuKeZ+/FDZ4EHwk4zQdM9WUa9ietWfy4dbtz938llFicIqh6E7mMUI96yX+MP3kx
+QSgnOTD9sXx7WP15kqis8iNkmgHRlWtbWEOVfqhLBOGIEbE60b5Vc8MerA2Lob+V
+flFKb1j5JV42EdVyDnHriPwddFO3+P6xL0ExPGBpPAdj5jOAqMUngc8z8LW3IAXk
+SUDpwhfPjYbzb6YO6oxh
+=AlUg
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (FreeBSD)
+
+iEYEABECAAYFAkwfPacACgkQ/P1jBZgh97Ih+gCfcUPk6sG/RnQDuw8ynjcrs3nL
+RiUAoMwxqZMnj1cYxf2HWPjVcT3Kd38L
+=G4JG
+-----END PGP SIGNATURE-----
diff --git a/subversion-1.6.9.tar.bz2.asc b/subversion-1.6.9.tar.bz2.asc
deleted file mode 100644
index 517fa6d..0000000
--- a/subversion-1.6.9.tar.bz2.asc
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAktXa4MACgkQCwOubk4kUXx7ygCfZhrG1g3yIXJFXzE43cvRa/Km
-4twAoIwwFkYnPLScBDJLqV892Nj+66eV
-=fTxc
------END PGP SIGNATURE-----
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (FreeBSD)
-
-iEYEABECAAYFAktYGmcACgkQ/P1jBZgh97InrgCgrsdwyhVH3AqraTusUY7rcaZV
-8hcAnA26+HHdB2hsV/SOR6vERCrE1Mdk
-=72+d
------END PGP SIGNATURE-----
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAktYI6AACgkQ9o1G+2zNQDjMugCfYS/nx1JBSjek3tSz3PWl5P7M
-ngQAoKa6tZEUi90RGDx6g3IRk1JuliWU
-=lrHM
------END PGP SIGNATURE-----
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAktYaNsACgkQokEGqRcG/W6J0gCgwbrbld0pqpQvtHAbD+q1Z2+v
-z3QAn3W/MbUedXAGTXFtT6yDEH8tnisC
-=DBmT
------END PGP SIGNATURE-----
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAktYtHQACgkQNR8z5DU+JbxMiQCfdfOVHogW1sZnr0cOCrMBQwD5
-FscAni6sZWK+c0eJtAUlyEHQyA4Mh7P7
-=WVnC
------END PGP SIGNATURE-----
diff --git a/subversion.conf b/subversion.conf
index 7b6c21e..16eddb5 100644
--- a/subversion.conf
+++ b/subversion.conf
@@ -9,7 +9,7 @@ LoadModule authz_svn_module   modules/mod_authz_svn.so
 #
 #   a) readable and writable by the 'apache' user, and
 #
-#   b) labelled with the 'http_sys_content_t' context if using
+#   b) labelled with the 'httpd_sys_content_t' context if using
 #   SELinux
 #
 
@@ -20,7 +20,7 @@ LoadModule authz_svn_module   modules/mod_authz_svn.so
 #   # cd /var/www/svn
 #   # svnadmin create stuff   
 #   # chown -R apache.apache stuff
-#   # chcon -R -t http_sys_content_t stuff
+#   # chcon -R -t httpd_sys_content_t stuff
 #
 
 #<Location /repos>
diff --git a/subversion.spec b/subversion.spec
index 3e3842a..22ed0ad 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -16,8 +16,8 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.6.11
-Release: 2%{?dist}
+Version: 1.6.12
+Release: 1%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.apache.org/
@@ -391,6 +391,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man1/svn2cl.1*
 
 %changelog
+* Wed Jul  7 2010 Joe Orton <jorton@redhat.com> - 1.6.12-1
+- update to 1.6.12 (#586629)
+- fix comments in subversion.conf (#551484)
+
 * Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.6.11-2
 - Mass rebuild with perl-5.12.0
 
diff --git a/upstream b/upstream
index c23848d..2b24a3b 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-subversion-1.6.11.tar.bz2
+subversion-1.6.12.tar.bz2