diff --git a/build_source.py b/build_source.py
index 954848f..1cc1669 100755
--- a/build_source.py
+++ b/build_source.py
@@ -40,7 +40,7 @@ def populate(self):
     out = p.communicate()[0]
     # See https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version for details
     # of the version field
-    matches = re.search(r"^Source: (.+)\nVersion: (?:\d+:)?([A-Za-s0-9.+:~-]*?)(?:-[^-\n]+)?\n", out)
+    matches = re.search(r"^Source: (.+)\nVersion: (?:\d+:)?([A-Za-z0-9.+:~-]*?)(?:-[^-\n]+)?\n", out)
 
     self.source = matches.group(1)
     self.version = matches.group(2)
diff --git a/pkg/goenv/debian/changelog b/pkg/goenv/debian/changelog
index d191bb5..460982e 100644
--- a/pkg/goenv/debian/changelog
+++ b/pkg/goenv/debian/changelog
@@ -1,3 +1,10 @@
+goenv (0.0.6-alext-1~ppa1) trusty; urgency=medium
+
+  * New upstream version 0.0.6
+  * Switch to alext fork
+
+ -- Alex Tomlins <alex.tomlins@digital.cabinet-office.gov.uk>  Fri, 23 Jan 2015 15:36:32 +0000
+
 goenv (0.0.5-1~ppa2) precise; urgency=low
 
   * Add fix for goenv install with newer versions (1.3.1+)
diff --git a/pkg/goenv/debian/control b/pkg/goenv/debian/control
index f65a30e..07dfa22 100644
--- a/pkg/goenv/debian/control
+++ b/pkg/goenv/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Alex Tomlins <alex.tomlins@digital.cabinet-office.gov.uk>
 Build-Depends: debhelper (>= 7.0.50)
 Standards-Version: 3.9.3
-Homepage: https://github.com/wfarr/goenv
+Homepage: https://github.com/alext/goenv
 
 Package: goenv
 Architecture: all
diff --git a/pkg/goenv/debian/patches/fix_install.diff b/pkg/goenv/debian/patches/fix_install.diff
deleted file mode 100644
index 55ce327..0000000
--- a/pkg/goenv/debian/patches/fix_install.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fix goenv install for 1.3.1
-Origin: https://github.com/wfarr/goenv/pull/13
-
-Index: goenv-0.0.5/libexec/goenv-install
-===================================================================
---- goenv-0.0.5.orig/libexec/goenv-install	2014-09-09 08:20:35.000000000 +0000
-+++ goenv-0.0.5/libexec/goenv-install	2014-09-09 08:20:50.000000000 +0000
-@@ -54,6 +54,7 @@
-     if [[ $1 == $2 ]]
-     then
-         echo 0
-+        return
-     fi
-     local IFS=.
-     local i ver1=($1) ver2=($2)
-@@ -72,10 +73,12 @@
-         if ((10#${ver1[i]} > 10#${ver2[i]}))
-         then
-             echo 1
-+            return
-         fi
-         if ((10#${ver1[i]} < 10#${ver2[i]}))
-         then
-             echo 2
-+            return
-         fi
-     done
- #    echo 0
diff --git a/pkg/goenv/debian/patches/series b/pkg/goenv/debian/patches/series
deleted file mode 100644
index 515bcd6..0000000
--- a/pkg/goenv/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_install.diff
diff --git a/pkg/goenv/srcurl b/pkg/goenv/srcurl
index 95ed43b..14b8cf9 100644
--- a/pkg/goenv/srcurl
+++ b/pkg/goenv/srcurl
@@ -1 +1 @@
-https://github.com/wfarr/goenv/archive/0.0.5.tar.gz
+https://github.com/alext/goenv/archive/v0.0.6.tar.gz