diff --git a/source.dif b/source.dif
index 78dbe37..089b05a 100644
--- a/source.dif
+++ b/source.dif
@@ -872,7 +872,7 @@
      }
    }
  
-+  if ($ENV{batchmode} eq "yes") {
++  if ($ENV{batchmode} and $ENV{batchmode} eq "yes") {
 +    $texargs="\\batchmode \\input $texargs" if $eng eq "tex" || $eng eq "ptex";
 +  }
    my $cmdline = "$eng -ini $tcxflag $recorderswitch $jobswitch "
diff --git a/texlive.changes b/texlive.changes
index 74c5584..0c9136b 100644
--- a/texlive.changes
+++ b/texlive.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Aug  1 07:53:05 UTC 2017 - schwab@suse.de
+
+- Define _GNU_SOURCE to request GNU extensions
+
+-------------------------------------------------------------------
+Thu Jun 29 12:13:34 UTC 2017 - werner@suse.de
+
+- Avoid nasty warning about missing batchmode in ENVironment
+
 -------------------------------------------------------------------
 Wed Jun 28 07:56:00 UTC 2017 - nico.kruber@gmail.com
 
diff --git a/texlive.spec b/texlive.spec
index 6206881..df7e541 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -19,7 +19,7 @@
 %define texlive_version  2017
 %define texlive_previous 2016
 %define texlive_release  20170520
-%define texlive_noarch   123
+%define texlive_noarch   130
 %define texlive_source   texlive-20170520-source
 
 %define __perl_requires		%{nil}
@@ -3269,11 +3269,7 @@ This package is required by the package texlive-biber-bin.
 %endif
     CC=gcc
     CXX=g++
-    if grep -q _DEFAULT_SOURCE /usr/include/features.h ; then
-	XCFLAGS="$RPM_OPT_FLAGS -D_POSIX_C_SOURCE=200803L -D_XOPEN_SOURCE=600 -D_DEFAULT_SOURCE"
-    else
-	XCFLAGS="$RPM_OPT_FLAGS -D_POSIX_C_SOURCE=200803L -D_XOPEN_SOURCE=600 -D_BSD_SOURCE"
-    fi
+    XCFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
     XCXXFLAGS="$XCFLAGS"
     cflags ()
     {