diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 56af2b899..bcf1bdeab 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-11  Corinna Vinschen  <corinna@vinschen.de>
+
+	* autoload.cc (CreateEnvironmentBlock): Make loading non-fatal.
+
 2015-03-11  Corinna Vinschen  <corinna@vinschen.de>
 
 	* autoload.cc (std_dll_init): Fix condition for breaking from DLL
diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc
index fd25e1780..5832e27bf 100644
--- a/winsup/cygwin/autoload.cc
+++ b/winsup/cygwin/autoload.cc
@@ -676,7 +676,7 @@ LoadDLLfunc (SetParent, 8, user32)
 LoadDLLfunc (SetProcessWindowStation, 4, user32)
 LoadDLLfunc (SetThreadDesktop, 4, user32)
 
-LoadDLLfunc (CreateEnvironmentBlock, 12, userenv)
+LoadDLLfuncEx (CreateEnvironmentBlock, 12, userenv, 1)
 LoadDLLfuncEx2 (CreateProfile, 16, userenv, 1, 1)
 LoadDLLfunc (DestroyEnvironmentBlock, 4, userenv)
 LoadDLLfunc (LoadUserProfileW, 8, userenv)