diff --git a/Contrib/Graphics/SConscript b/Contrib/Graphics/SConscript
index b8588d74..0f9fbe22 100644
--- a/Contrib/Graphics/SConscript
+++ b/Contrib/Graphics/SConscript
@@ -90,8 +90,8 @@ wizards = Split("""
 
 Import('defenv')
 
-def join(prefix, list):
-	return map(lambda x: '%s/%s' % (prefix, x), list)
+def join(prefix, list_):
+	return list(map(lambda x: '%s/%s' % (prefix, x), list_))
 
 def dist(dir, files):
 	defenv.DistributeContrib(join(dir, files), path='Graphics/%s' % dir)
diff --git a/Contrib/Modern UI 2/SConscript b/Contrib/Modern UI 2/SConscript
index a3d90837..abab407a 100644
--- a/Contrib/Modern UI 2/SConscript	
+++ b/Contrib/Modern UI 2/SConscript	
@@ -34,8 +34,8 @@ pages = Split("""
 
 Import('defenv')
 
-def join(prefix, list):
-	return map(lambda x: '%s/%s' % (prefix, x), list)
+def join(prefix, list_):
+	return list(map(lambda x: '%s/%s' % (prefix, x), list_))
 
 defenv.DistributeDocs(docs, path=target)
 defenv.DistributeDocs(join('../Modern UI/images',doc_images), path='%s/%s'%(target,'images'))
diff --git a/Contrib/Modern UI/SConscript b/Contrib/Modern UI/SConscript
index 551aa78f..fa3d1291 100644
--- a/Contrib/Modern UI/SConscript	
+++ b/Contrib/Modern UI/SConscript	
@@ -22,8 +22,8 @@ contribs = Split("""
 
 Import('defenv')
 
-def join(prefix, list):
-	return map(lambda x: '%s/%s' % (prefix, x), list)
+def join(prefix, list_):
+	return list(map(lambda x: '%s/%s' % (prefix, x), list_))
 
 defenv.DistributeDocs(docs, path=target)
 path = 'images'
diff --git a/Docs/src/history.but b/Docs/src/history.but
index c50b930d..3321785a 100644
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -22,6 +22,8 @@ Released on ? ?th, 2020
 
 \b MultiUser: Fixed INSTALLMODE_FUNCTION and added INSTALLMODEPAGE_SHOWUSERNAME
 
+\b Python 3 fixes (\W{http://sf.net/p/nsis/patches/296}{patch #296})
+
 \H{v3.05} 3.05
 
 Released on December 15th, 2019
diff --git a/SConstruct b/SConstruct
index e8252c97..01915c9d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -366,7 +366,7 @@ defenv.Execute(Delete('$TESTDISTDIR'))
 def Distribute(files, names, component, path, subpath, alias, install_alias=None):
 	files = MakeFileList(files)
 
-	names = names or map(lambda x: x.name, files)
+	names = names or list(map(lambda x: x.name, files))
 	if isinstance(names, str):
 		names = [names]