diff --git a/.gitignore b/.gitignore
index 715789a..d0fe524 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ modules-3.2.8.tar.bz2
 /modules-3.2.9c.tar.bz2
 /modules-3.2.10.tar.bz2
 /modules-4.0.0.tar.bz2
+/modules-4.1.0.tar.bz2
diff --git a/environment-modules.spec b/environment-modules.spec
index b4acf81..07177fc 100644
--- a/environment-modules.spec
+++ b/environment-modules.spec
@@ -1,8 +1,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           environment-modules
-Version:        4.0.0
-Release:        2%{?dist}
+Version:        4.1.0
+Release:        1%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
@@ -12,8 +12,8 @@ Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.
 Source4:        macros.%{name}
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
-BuildRequires:  dejagnu, sed, hostname, man
-Requires:       tcl, sed, procps, man, hostname
+BuildRequires:  dejagnu, sed, hostname, man, less
+Requires:       tcl, sed, procps, man, hostname, less
 Requires(post): %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
 Provides:	environment(modules)
@@ -63,7 +63,8 @@ This package provides Environment Modules compatibility version (3.2).
            --libexecdir=%{_datadir}/Modules/libexec \
            --docdir=%{_docdir}/%{name} \
            --enable-dotmodulespath \
-           --with-modulepath=%{_datadir}/Modules/modulefiles:%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles
+           --with-modulepath=%{_datadir}/Modules/modulefiles:%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles \
+           --with-quarantine-vars=LD_LIBRARY_PATH
 make %{?_smp_mflags}
 
 
@@ -78,6 +79,8 @@ mkdir -p %{buildroot}%{_bindir}
 # Set up for alternatives.
 touch %{buildroot}%{_sysconfdir}/profile.d/modules.{csh,sh}
 touch %{buildroot}%{_bindir}/modulecmd
+# remove modulecmd wrapper as it will be handled by alternatives
+rm -f %{buildroot}%{_datadir}/Modules/bin/modulecmd
 mv %{buildroot}%{_mandir}/man1/module{,-c}.1
 mv %{buildroot}%{_mandir}/man4/modulefile{,-c}.4
 
@@ -172,6 +175,10 @@ fi
 
 
 %changelog
+* Mon Jan 22 2018 Jan Synáček <jsynacek@redhat.com> - 4.1.0-1
+- Update to 4.1.0 (#1534746)
+  + Big thanks to Xavier Delaruelle for a spec patch!
+
 * Tue Nov 21 2017 Jan Synáček <jsynacek@redhat.com> - 4.0.0-2
 - Fix 4.0.0 BuildRequires and Requires (#1503408)
   + Big thanks to Xavier Delaruelle for a spec patch!
diff --git a/sources b/sources
index f041293..aa6f2b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (modules-4.0.0.tar.bz2) = 821b1ba2b92df8a9222af3f203e10207d33988b9cf41e2b4004926a3f2b21dbf83adc7a260ae06de2780816e507b758e3d8ff66354e1804bad8198a33f7b0fb8
+SHA512 (modules-4.1.0.tar.bz2) = 28c68bf0c0c939db93186b355eb7162f503de8f179c8ed1b8fd83585e363ecc43bf34376a0508e3d2bcc164855b73917e067b79980194ce587dbb0d49d16dbd7