diff --git a/compiler/extccomp.nim b/compiler/extccomp.nim
index ad9c389041..bc888315ff 100644
--- a/compiler/extccomp.nim
+++ b/compiler/extccomp.nim
@@ -332,7 +332,6 @@ const
     ucc(),
     icl()]
 
-const
   hExt* = ".h"
 
 var
@@ -547,6 +546,7 @@ proc getCompileCFileCmd*(cfilename: string, isExternal = false): string =
                 else:
                   completeCFilePath(toObjFile(cfile))
   objfile = quoteShell(objfile)
+  cfile = quoteShell(cfile)
   result = quoteShell(compilePattern % [
     "file", cfile, "objfile", objfile, "options", options,
     "include", includeCmd, "nimrod", getPrefixDir(),
@@ -717,4 +717,3 @@ proc writeMapping*(gSymbolMapping: PRope) =
   
   appf(code, "\n[Symbols]$n$1", [gSymbolMapping])
   writeRope(code, joinPath(gProjectPath, "mapping.txt"))
-  
diff --git a/tests/misc/tspace in filename.nim b/tests/misc/tspace in filename.nim
new file mode 100644
index 0000000000..8db4b52f22
--- /dev/null
+++ b/tests/misc/tspace in filename.nim	
@@ -0,0 +1,3 @@
+# Test for the compiler to be able to compile a Nim file with spaces in it.
+
+echo("Successful")
\ No newline at end of file