diff --git a/configure.ac b/configure.ac
index bd9e60dc..826c390a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,8 @@ AM_CONDITIONAL([DEFAULT_VENDOR_GOPATH], [test x"${VENDOR_GOPATH}" == x""])
 AM_CONDITIONAL([READONLY_VENDOR_GOPATH], [test -n "${VENDOR_GOPATH}" -a ! -w "${VENDOR_GOPATH}"])
 AM_COND_IF(DEFAULT_VENDOR_GOPATH, [AC_SUBST(VENDOR_GOPATH, $PWD/vendor)])
 AC_MSG_RESULT([$VENDOR_GOPATH])
-AM_CONDITIONAL([GO_14], [test x"${GO_VERSION}" == x"1.4"])
+AX_COMPARE_VERSION([$GO_VERSION], [lt], [1.5], [GO_14="1"], [GO_14="0"])
+AM_CONDITIONAL([GO_14], [test x"${GO_14}" = x"1"])
 
 AC_PATH_PROGS([NODEJS],[nodejs node])
 if test x"${NODEJS}" == x"" ; then