diff --git a/python-pymacaroons.changes b/python-pymacaroons.changes
index 48674c0..425c672 100644
--- a/python-pymacaroons.changes
+++ b/python-pymacaroons.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 19 10:46:51 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Conflict with pymacaroons-pynacl
+
 -------------------------------------------------------------------
 Wed Feb  6 16:52:14 UTC 2019 - ecsos@opensuse.org
 
diff --git a/python-pymacaroons.spec b/python-pymacaroons.spec
index 0594535..baed7b8 100644
--- a/python-pymacaroons.spec
+++ b/python-pymacaroons.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -26,26 +26,27 @@ License:        MIT
 Group:          Development/Languages/Python
 URL:            https://github.com/ecordell/pymacaroons
 Source:         https://github.com/ecordell/pymacaroons/archive/v%{version}/%{name}-%{version}.tar.gz
-BuildRequires:  %{python_module PyNaCl >= 1.1.2}
 BuildRequires:  %{python_module PyNaCl < 2.0}
+BuildRequires:  %{python_module PyNaCl >= 1.1.2}
 #BuildRequires:  %%{python_module bumpversion}
-BuildRequires:  %{python_module python-coveralls >= 2.4.2}
+BuildRequires:  %{python_module Sphinx >= 1.2.3}
 BuildRequires:  %{python_module cffi}
 BuildRequires:  %{python_module coverage}
 BuildRequires:  %{python_module hypothesis}
 BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module nose}
+BuildRequires:  %{python_module python-coveralls >= 2.4.2}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module Sphinx >= 1.2.3}
 BuildRequires:  %{python_module six >= 1.8.0}
 BuildRequires:  python-tox
 ##BuildRequires:  %%{python_module yanc}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-Requires:       python-PyNaCl >= 1.1.2
 Requires:       python-PyNaCl < 2.0
+Requires:       python-PyNaCl >= 1.1.2
 Requires:       python-cffi
 Requires:       python-six >= 1.8.0
+Conflicts:      python-pymacaroons-pynacl
 BuildArch:      noarch
 %python_subpackages