diff --git a/Godeps b/Godeps
new file mode 100644
index 00000000..d35db730
--- /dev/null
+++ b/Godeps
@@ -0,0 +1,11 @@
+github.com/gorilla/context						215affda49addc4c8ef7e2534915df2c8c35c6cd
+github.com/gorilla/mux							94903de8c98a68d8b4483c529b26a5d146e386a2
+github.com/gorilla/securecookie					1b0c7f6e9ab3d7f500fd7d50c7ad835ff428139b
+github.com/gorilla/websocket					1e6e1281b05fe5eaaf3300bdedb8e75880b9c6fd
+github.com/longsleep/pkac						0.0.1
+github.com/satori/go.uuid						46e1db27972f44c7722f23195ba6a8d2c2f3a0a3
+github.com/strukturag/goacceptlanguageparser	goacceptlanguageparser_v100
+github.com/strukturag/httputils					httputils_v012
+github.com/strukturag/phoenix					phoenix_v0130
+github.com/strukturag/sloth						v0.9.2
+code.google.com/p/goconf/...					a4db5c465ed1
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index e3dcb99b..8c7fc254 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,7 @@ DIST_BIN := $(DIST)/bin
 
 all: build
 
-build: binary assets
+build: get binary assets
 
 gopath:
 	@echo GOPATH=$(GOPATH)
@@ -59,7 +59,11 @@ endif
 
 getupdate: vendorclean get
 
-binary: get
+gpm:
+	@if [ "$(GPM)" = "" ]; then echo "Command 'gpm' not found"; exit 1; fi
+	$(GPM) install
+
+binary:
 	$(GO) build $(GOBUILDFLAGS) -o bin/$(EXENAME) -ldflags '$(LDFLAGS)' app/$(EXENAME)
 
 binaryrace: GOBUILDFLAGS := $(GOBUILDFLAGS) -race
diff --git a/configure.ac b/configure.ac
index a068e3f0..7b49dde9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,13 @@ AC_PROG_AWK
 
 AC_PATH_PROGS([FIND],[find])
 
+AC_PATH_PROGS([GPM],[gpm])
+if test x"${GPM}" != x"" ; then
+    AC_MSG_CHECKING([for version of gpm])
+    GPM_VERSION=`$GPM version 2>&1 | $SED 's/^>> gpm v//'`
+    AC_MSG_RESULT([$GPM_VERSION])
+fi
+
 AC_PATH_PROG([JSHINT],jshint, [], [$PWD/node_modules/.bin$PATH_SEPARATOR$PATH])
 if test x"${JSHINT}" != x"" ; then
     AC_MSG_CHECKING([for version of jshint])