diff --git a/Docs/src/SConscript b/Docs/src/SConscript
index 4ee66bd6..6b289b84 100644
--- a/Docs/src/SConscript
+++ b/Docs/src/SConscript
@@ -68,9 +68,9 @@ replacement = '<a href="%s/\\1/' % env.subst('$PREFIX_DATA')
 
 def fix_html(target, source, env):
 	for i in range(len(source)):
-		data = open(str(source[i]),'rb').read()
+		data = open(source[i].path,'rb').read()
 		data = re.sub('<a href="../(Include|Stubs|Plugins|Contrib)/', replacement, data)
-		open(str(target[i]),'wb').write(data)
+		open(target[i].path,'wb').write(data)
 	return None
 
 if build_chm:
diff --git a/SConstruct b/SConstruct
index 351818cf..125f8bf9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -188,16 +188,30 @@ defenv.Execute(Delete('$ZIPDISTDIR'))
 defenv.Execute(Delete('$INSTDISTDIR'))
 defenv.Execute(Delete('$TESTDISTDIR'))
 
-def Distribute(files, names, component, path, subpath, alias, install_alias=None):
-	if isinstance(files, (str, type(File('SConstruct')))):
-		files = [files]
-	files = map(File, files)
+def SafeFile(f):
+	from types import StringType
 
-	if isinstance(names, str):
+	if isinstance(f, StringType):
+		return File(f)
+
+	return f
+
+def MakeFileList(files):
+	from types import ListType, TupleType
+
+	if isinstance(files, (ListType, TupleType)):
+		return map(SafeFile, files)
+
+	return Flatten([SafeFile(files)])
+
+def Distribute(files, names, component, path, subpath, alias, install_alias=None):
+	from types import StringType
+
+	files = MakeFileList(files)
+
+	names = names or map(lambda x: x.name, files)
+	if isinstance(names, StringType):
 		names = [names]
-	if not names:
-		names = map(str, files)
-		names = map(os.path.basename, names)
 
 	for d in ('$ZIPDISTDIR', '$INSTDISTDIR', '$TESTDISTDIR'):
 		paths = map(lambda file: os.path.join(d, path, subpath, file), names)