diff --git a/.cvsignore b/.cvsignore
index b12cfbd..9707f66 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dogtag-pki-ra-ui-1.3.0.tar.gz
+dogtag-pki-ra-ui-1.3.1.tar.gz
diff --git a/dogtag-pki-ra-ui.spec b/dogtag-pki-ra-ui.spec
index 281d80c..1c88c04 100644
--- a/dogtag-pki-ra-ui.spec
+++ b/dogtag-pki-ra-ui.spec
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-ra-ui
-Version:        1.3.0
-Release:        5%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Registration Authority User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -18,6 +18,18 @@ Obsoletes:      pki-ra-ui < %{version}-%{release}
 
 Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
 
+# NOTE:  The 'Dogtag Certificate System' and 'Red Hat Certificate System'
+#        may NOT co-exist on the same system!
+#
+#        For example, with the advent of EPEL packages, a user may attempt to
+#        install a Dogtag Certificate System on a system which already contains
+#        a Red Hat Certificate System.  Since the 'dogtag-pki-ra-ui' UI
+#        package conflicts with the 'redhat-pki-ra-ui' UI package,
+#        disallow this action by notifying the user that these two packages
+#        conflict.  (see Bugzilla Bug #580282 for details)
+#
+Conflicts:        redhat-pki-ra-ui
+
 %description
 Dogtag Certificate System is an enterprise software system designed
 to manage enterprise Public Key Infrastructure (PKI) deployments.
@@ -50,6 +62,14 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
+* Thu Apr 8 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-1
+- Bugzilla Bug #564131 - Config wizard : all subsystems - done panel text
+  needs correction
+
+* Wed Apr 7 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-6
+- Bugzilla Bug #580282 - Dogtag PKI UI Packages should "Conflict" with
+  associated Red Hat PKI UI Packages . . .
+
 * Mon Jan 18 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-5
 - Bugzilla Bug #553848 - New Package for Dogtag PKI: dogtag-pki-ra-ui
 - Fixed various licensing headers
diff --git a/import.log b/import.log
index 828a54b..fa4e280 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 dogtag-pki-ra-ui-1_3_0-5_fc13:HEAD:dogtag-pki-ra-ui-1.3.0-5.fc13.src.rpm:1263941861
+dogtag-pki-ra-ui-1_3_1-1_fc14:HEAD:dogtag-pki-ra-ui-1.3.1-1.fc14.src.rpm:1278650414
diff --git a/sources b/sources
index 3d94015..20812d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-296c9f2109d66231f3fed87b53d2a41e  dogtag-pki-ra-ui-1.3.0.tar.gz
+5095469b9cbb703d2201f4d2c5b471fd  dogtag-pki-ra-ui-1.3.1.tar.gz