diff --git a/vendor/github.com/bgentry/speakeasy/.gitignore b/vendor/github.com/bgentry/speakeasy/.gitignore
deleted file mode 100644
index 9e1311461e..0000000000
--- a/vendor/github.com/bgentry/speakeasy/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-example/example
-example/example.exe
diff --git a/vendor/github.com/bgentry/speakeasy/speakeasy.go b/vendor/github.com/bgentry/speakeasy/speakeasy.go
index d16233a1a4..476b7d93db 100644
--- a/vendor/github.com/bgentry/speakeasy/speakeasy.go
+++ b/vendor/github.com/bgentry/speakeasy/speakeasy.go
@@ -16,14 +16,14 @@ func Ask(prompt string) (password string, err error) {
 
 // Same as the Ask function, except it is possible to specify the file to write
 // the prompt to.
-func FAsk(file *os.File, prompt string) (password string, err error) {
+func FAsk(wr io.Writer, prompt string) (password string, err error) {
 	if prompt != "" {
-		fmt.Fprint(file, prompt) // Display the prompt.
+		fmt.Fprint(wr, prompt) // Display the prompt.
 	}
 	password, err = getPassword()
 
 	// Carriage return after the user input.
-	fmt.Fprintln(file, "")
+	fmt.Fprintln(wr, "")
 	return
 }
 
diff --git a/vendor/github.com/bgentry/speakeasy/speakeasy_windows.go b/vendor/github.com/bgentry/speakeasy/speakeasy_windows.go
index fc4177c44d..c2093a8091 100644
--- a/vendor/github.com/bgentry/speakeasy/speakeasy_windows.go
+++ b/vendor/github.com/bgentry/speakeasy/speakeasy_windows.go
@@ -3,7 +3,6 @@
 package speakeasy
 
 import (
-	"os"
 	"syscall"
 )
 
@@ -12,18 +11,17 @@ import (
 const ENABLE_ECHO_INPUT = 0x0004
 
 func getPassword() (password string, err error) {
-	hStdin := syscall.Handle(os.Stdin.Fd())
 	var oldMode uint32
 
-	err = syscall.GetConsoleMode(hStdin, &oldMode)
+	err = syscall.GetConsoleMode(syscall.Stdin, &oldMode)
 	if err != nil {
 		return
 	}
 
 	var newMode uint32 = (oldMode &^ ENABLE_ECHO_INPUT)
 
-	err = setConsoleMode(hStdin, newMode)
-	defer setConsoleMode(hStdin, oldMode)
+	err = setConsoleMode(syscall.Stdin, newMode)
+	defer setConsoleMode(syscall.Stdin, oldMode)
 	if err != nil {
 		return
 	}
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 5c382b4b23..335e45c4d1 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -39,12 +39,16 @@
 			"revisionTime": "2016-01-15T23:47:25Z"
 		},
 		{
+			"checksumSHA1": "dvd7Su+WNmHRP1+w1HezrPUCDsc=",
 			"path": "github.com/bgentry/speakeasy",
-			"revision": "36e9cfdd690967f4f690c6edcc9ffacd006014a0"
+			"revision": "e1439544d8ecd0f3e9373a636d447668096a8f81",
+			"revisionTime": "2016-05-20T23:26:10Z"
 		},
 		{
+			"checksumSHA1": "twtRfb6484vfr2qqjiFkLThTjcQ=",
 			"path": "github.com/bgentry/speakeasy/example",
-			"revision": "36e9cfdd690967f4f690c6edcc9ffacd006014a0"
+			"revision": "e1439544d8ecd0f3e9373a636d447668096a8f81",
+			"revisionTime": "2016-05-20T23:26:10Z"
 		},
 		{
 			"comment": "v1.2.1",