diff --git a/buildfile.go b/buildfile.go
index 4ac8e75bd4..3075812436 100644
--- a/buildfile.go
+++ b/buildfile.go
@@ -288,7 +288,7 @@ func (b *buildFile) addContext(container *Container, orig, dest string) error {
 		destPath = destPath + "/"
 	}
 	if !strings.HasPrefix(origPath, b.context) {
-		return fmt.Errorf("Forbidden path: %s", origPath)
+		return fmt.Errorf("Forbidden path outside the build context: %s (%s)", orig, origPath)
 	}
 	fi, err := os.Stat(origPath)
 	if err != nil {
diff --git a/integration/buildfile_test.go b/integration/buildfile_test.go
index 964b58403b..20d0450a7c 100644
--- a/integration/buildfile_test.go
+++ b/integration/buildfile_test.go
@@ -483,7 +483,7 @@ func TestForbiddenContextPath(t *testing.T) {
 		t.Fail()
 	}
 
-	if err.Error() != "Forbidden path: /" {
+	if err.Error() != "Forbidden path outside the build context: ../../ (/)" {
 		t.Logf("Error message is not expected: %s", err.Error())
 		t.Fail()
 	}