diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d951aa..8b452b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Release 0.9.1 (xxxx-xx-xx)
+
+- Fixed #267: Glide was only walking the import tree based on build flags for
+  the current OS and Arch. This is a problem for systems like docker that have
+  variation built in.
+
 # Release 0.9.0 (2016-02-17)
 
 - Fixed #262: Using correct query string merging for go-get queries (thanks gdm85).
diff --git a/util/util.go b/util/util.go
index 9a58b04..c16c4db 100644
--- a/util/util.go
+++ b/util/util.go
@@ -262,6 +262,11 @@
 // TODO: This should be moved to the `dependency` package.
 func GetBuildContext() (*BuildCtxt, error) {
 	buildContext := &BuildCtxt{build.Default}
+
+	// This tells the context scanning to skip filtering on +build flags or
+	// file names.
+	buildContext.UseAllFiles = true
+
 	if goRoot := os.Getenv("GOROOT"); len(goRoot) == 0 {
 		out, err := exec.Command("go", "env", "GOROOT").Output()
 		if goRoot = strings.TrimSpace(string(out)); len(goRoot) == 0 || err != nil {