diff --git a/python-nbdime.changes b/python-nbdime.changes
index f0a2312..cb75668 100644
--- a/python-nbdime.changes
+++ b/python-nbdime.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 15 15:56:00 UTC 2019 - Todd R <toddrme2178@gmail.com>
+
+- Add conflicts to jupyter subpackage to more explicitly handle
+  file overlaps with old naming scheme.
+
 -------------------------------------------------------------------
 Thu Apr 25 01:59:57 UTC 2019 - Todd R <toddrme2178@gmail.com>
 
diff --git a/python-nbdime.spec b/python-nbdime.spec
index 9fab1f7..f67f85a 100644
--- a/python-nbdime.spec
+++ b/python-nbdime.spec
@@ -59,6 +59,9 @@ Provides:       python-jupyter_nbdime-hg = %{version}
 Obsoletes:      python-jupyter_nbdime-hg < %{version}
 Provides:       python-jupyter_nbdime-git = %{version}
 Obsoletes:      python-jupyter_nbdime-git < %{version}
+%else
+Conflicts:      python-jupyter_nbdime-hg < 1.0.5
+Conflicts:      python-jupyter_nbdime-git < 1.0.5
 %endif
 Recommends:     python-tabulate
 Provides:       python-jupyter_nbdime = %{version}
@@ -77,6 +80,7 @@ Summary:        A JupyterLab extension for showing Notebook diffs
 Requires:       jupyter-nbformat
 Requires:       jupyter-notebook
 Requires:       python3-nbdime = %{mainver}
+Conflicts:      python3-jupyter_nbdime < 1.0.5
 
 %description -n jupyter-nbdime
 The nbdime package provides tools for diffing and merging of