diff --git a/.gitignore b/.gitignore
index 8f047f3bfe..2e9b2557e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -214,13 +214,13 @@
 /lib/bcc_lib
 /lib/cdef*.res
 /lib/dmc_lib
-/lib/evc_armv4_lib
-/lib/evc_emulator_lib
 /lib/expat*.lib
-/lib/gcc_dll
+/lib/gcc*_dll
+/lib/gcc*_x64_dll
 /lib/gcc_dll32
 /lib/gcc_dll64
-/lib/gcc_lib
+/lib/gcc*_lib
+/lib/gcc*_x64_lib
 /lib/gcc_lib32
 /lib/gcc_lib64
 /lib/jpeg*.lib
diff --git a/.mailmap b/.mailmap
index 0799395da8..8b9f5a7020 100644
--- a/.mailmap
+++ b/.mailmap
@@ -51,6 +51,7 @@ Richard Fath							<richard.fath@t-online.de>
 Richard Powell							<rmpowell77@me.com>
 Rick S			<rivdsl@gmail.com>			<rivdsl@hotmail.com>
 Roberto Boriotti	<roberto.boriotti@canon-europe.com>
+Steffen Olszewski	<steffen.olszewski@gero-mess.de>	<sodev@trac.wxwidgets.org>
 Steve Browne		<swbrowne@gmail.com>			<sbrowne@unknown>
 			<swbrowne@gmail.com>			<amn3sia@gmail.com>
 Tim Kosse		<tim.kosse@gmx.de>			<tim.kosse@filezilla-project.org>
diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index d14d5dd2d7..b08c08dada 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -488,7 +488,7 @@ it if SHARED=1 unless you know what you are doing.
         <set var="EXTRALIBS_GUI"/>
         <set var="EXTRALIBS_OPENGL">
             <if cond="COMPILER=='wat' and TOOLKIT=='MSW'">opengl32.lib glu32.lib</if>
-            <if cond="COMPILER in ['vc','evc']">opengl32.lib glu32.lib</if>
+            <if cond="COMPILER=='vc'">opengl32.lib glu32.lib</if>
             <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
         </set>
         <set var="EXTRALIBS_SDL"/>