diff --git a/mutt.changes b/mutt.changes
index d7d457c..d6622c4 100644
--- a/mutt.changes
+++ b/mutt.changes
@@ -2,6 +2,8 @@
 Fri May 20 15:14:52 UTC 2016 - werner@suse.de
 
 - Enable some of the new patches like sidebar (boo#980830) 
+- Add patch COLS-workaround.dif which should become removed once
+  the sidebar patch does not modify COLS anymore
 
 -------------------------------------------------------------------
 Thu May 12 13:50:14 UTC 2016 - werner@suse.de
diff --git a/mutt.spec b/mutt.spec
index 04b54b7..5c79a0b 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -43,7 +43,9 @@ BuildRequires:  libxml2
 BuildRequires:  libxslt
 BuildRequires:  lynx
 BuildRequires:  ncurses-devel
+%if 0%{?is_opensuse}
 BuildRequires:  notmuch-devel
+%endif
 BuildRequires:  postfix
 BuildRequires:  sgml-skel
 BuildRequires:  update-desktop-files
@@ -205,7 +207,9 @@ chmod 755 $KRB5CFGPATH
 	--enable-mailtool \
 	--enable-compressed \
 	--enable-sidebar \
+%if 0%{?is_opensuse}
 	--enable-notmuch  \
+%endif
 	--enable-hcache \
 	--disable-external-dotlock \
 	--with-ssl=%{_prefix} \