diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes
index ba4c67b..70fc5c9 100644
--- a/ffmpeg-4.changes
+++ b/ffmpeg-4.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jul 26 08:09:32 UTC 2018 - tchvatal@suse.com
+
+- Redo the nvidia condition based on review feeback
+
 -------------------------------------------------------------------
 Wed Jul 25 08:30:56 UTC 2018 - tchvatal@suse.com
 
diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec
index fc3646e..09c64ba 100644
--- a/ffmpeg-4.spec
+++ b/ffmpeg-4.spec
@@ -38,6 +38,16 @@
 %{preamble_string} ffmpeg-private-devel %{comparator} %{conflicts_version} \
 %{nil}
 
+# nvidia adds library present only after leap15
+%bcond_with nvcodec
+%if 0%{?BUILD_ORIG}
+%bcond_without nvidia
+%if 0%{?suse_version} > 1500
+%bcond_without nvcodec
+%endif
+%else
+%bcond_with nvidia
+%endif
 %bcond_with    fdk_aac
 %bcond_with    librtmp
 %bcond_with    opencore
@@ -56,12 +66,10 @@
 %bcond_without mysofa
 %bcond_without vidstab
 %bcond_without srt
-%bcond_without nvidia
 %else
 %bcond_with mysofa
 %bcond_with vidstab
 %bcond_with srt
-%bcond_with nvidia
 %endif
 
 %if 0%{?suse_version} >= 1500
@@ -202,7 +210,7 @@ BuildRequires:  pkgconfig(fdk-aac)
 %if %{with librtmp}
 BuildRequires:  pkgconfig(librtmp)
 %endif
-%if %{with nvidia}
+%if %{with nvcodec}
 BuildRequires:  pkgconfig(ffnvcodec)
 %endif
 %if %{with xvid}