diff --git a/.gitignore b/.gitignore
index 07b14de5f..7a2a865d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
 /aws-vault
 /aws-vault-*
-.DS_Store
-*~
diff --git a/Makefile b/Makefile
index 57072faf5..1346f4c8d 100644
--- a/Makefile
+++ b/Makefile
@@ -24,13 +24,10 @@ aws-vault-darwin-amd64: $(SRC)
 aws-vault-windows-386.exe: $(SRC)
 	GOOS=windows GOARCH=386 go build -o $@ -ldflags="$(FLAGS)" .
 
-aws-vault-freebsd-386: $(SRC)
-	GOOS=freebsd GOARCH=386 go build -o $@ -ldflags="$(FLAGS)" .
-
 aws-vault-freebsd-amd64: $(SRC)
 	GOOS=freebsd GOARCH=amd64 go build -o $@ -ldflags="$(FLAGS)" .
 
-release: aws-vault-linux-amd64 aws-vault-darwin-amd64 aws-vault-windows-386.exe aws-vault-freebsd-386 aws-vault-freebsd-amd64
+release: aws-vault-linux-amd64 aws-vault-darwin-amd64 aws-vault-windows-386.exe aws-vault-freebsd-amd64
 
 clean:
-	rm -f aws-vault aws-vault-linux-amd64 aws-vault-darwin-amd64 aws-vault-windows-386.exe aws-vault-freebsd-386 aws-vault-freebsd-amd64
+	rm -f aws-vault aws-vault-linux-amd64 aws-vault-darwin-amd64 aws-vault-windows-386.exe aws-vault-freebsd-amd64
diff --git a/server/alias_darwin.go b/server/alias_bsd.go
similarity index 86%
rename from server/alias_darwin.go
rename to server/alias_bsd.go
index e87cd14c5..b514f6ed9 100644
--- a/server/alias_darwin.go
+++ b/server/alias_bsd.go
@@ -1,4 +1,4 @@
-// build: darwin
+// +build darwin freebsd
 
 package server
 
diff --git a/server/alias_freebsd.go b/server/alias_freebsd.go
deleted file mode 100644
index 97973ce50..000000000
--- a/server/alias_freebsd.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// build: freebsd
-
-package server
-
-import "os/exec"
-
-func installNetworkAlias() ([]byte, error) {
-	return exec.Command("ifconfig", "lo0", "alias", "169.254.169.254").CombinedOutput()
-}
diff --git a/server/alias_linux.go b/server/alias_linux.go
index 5f19e0178..d86a99b7a 100644
--- a/server/alias_linux.go
+++ b/server/alias_linux.go
@@ -1,4 +1,4 @@
-// build: linux
+// +build linux
 
 package server
 
diff --git a/server/alias_windows.go b/server/alias_windows.go
index 6ed6eed43..9cdcad339 100644
--- a/server/alias_windows.go
+++ b/server/alias_windows.go
@@ -1,4 +1,4 @@
-// build: windows
+// +build windows
 
 package server