diff --git a/Gopkg.lock b/Gopkg.lock
index f7a1b3398..6c3610bf9 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -95,6 +95,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "13931e3dc144611ad27c9cc8e720fdf547dcd2ca4538e7446cbf390235d32ca0"
+  inputs-digest = "d87f11b11c23cf6aee9a8368e041cca35177f41668c25f68c5d74a75522c5fdf"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/builder/build.go b/builder/build.go
index 0b93a65cd..8d1eec84d 100644
--- a/builder/build.go
+++ b/builder/build.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"strings"
 
 	"github.com/openfaas/faas-cli/schema"
@@ -169,7 +170,10 @@ func createBuildTemplate(functionName string, handler string, language string) s
 			fmt.Println("Skipping \"build\" folder")
 			continue
 		default:
-			CopyFiles(info.Name(), functionPath)
+			CopyFiles(
+				filepath.Clean(handler+"/"+info.Name()),
+				filepath.Clean(functionPath+"/"+info.Name()),
+			)
 		}
 	}
 
@@ -204,7 +208,10 @@ func dockerBuildFolder(functionName string, handler string, language string) str
 			fmt.Println("Skipping \"build\" folder")
 			continue
 		default:
-			CopyFiles(info.Name(), tempPath)
+			CopyFiles(
+				filepath.Clean(handler+"/"+info.Name()),
+				filepath.Clean(tempPath+"/"+info.Name()),
+			)
 		}
 	}