diff --git a/databases/godis/Makefile b/databases/godis/Makefile
index 30c5296cffa6..27df8eb7fcf3 100644
--- a/databases/godis/Makefile
+++ b/databases/godis/Makefile
@@ -6,17 +6,25 @@
 #
 
 PORTNAME=	godis
-PORTVERSION=	20110803
-PORTREVISION=	3
+PORTVERSION=	20120405
 CATEGORIES=	databases
 MASTER_SITES=	LOCAL/jlaffaye
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	A Redis client library written in Go
 
-PLIST_FILES=	${GO_LIBDIR}/godis.a
-
 USE_GO=		yes
+GO_PKGNAME=	${SUBLIBDIR}/${PORTNAME}
+
+SUBLIBDIR=	github.com/simonz05
+
+do-install:
+	${MKDIR} ${GO_LOCAL_LIBDIR}/${SUBLIBDIR}
+	${INSTALL_DATA} ${GO_WRKDIR_PKG}/${SUBLIBDIR}/godis.a ${GO_LOCAL_LIBDIR}/${SUBLIBDIR}
+	${MKDIR} ${GO_LOCAL_SRCDIR}/${GO_PKGNAME}
+.for f in godis.go commands.go conn.go
+	${INSTALL_DATA} ${GO_WRKSRC}/${f} ${GO_LOCAL_SRCDIR}/${GO_PKGNAME}
+.endfor
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/lang/go/files/bsd.go.mk"
diff --git a/databases/godis/distinfo b/databases/godis/distinfo
index 7e2b52ff416f..3a16816c0db6 100644
--- a/databases/godis/distinfo
+++ b/databases/godis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (godis-20110803.tar.gz) = 24a3fb5e90983caa23163b33ed2d18d997747d5683f92fc1cbf335ad5bfed917
-SIZE (godis-20110803.tar.gz) = 15584
+SHA256 (godis-20120405.tar.gz) = 5be02502b07386085ac4ba6d92b749a7829fd694ad8bfee0d15b0960074b44b2
+SIZE (godis-20120405.tar.gz) = 17712
diff --git a/databases/godis/files/patch-conn.go b/databases/godis/files/patch-conn.go
deleted file mode 100644
index 2ebb27bcd9d1..000000000000
--- a/databases/godis/files/patch-conn.go
+++ /dev/null
@@ -1,24 +0,0 @@
---- conn.go.orig	2011-09-04 22:00:03.000000000 +0200
-+++ conn.go	2012-01-18 21:31:25.000000000 +0100
-@@ -342,8 +342,8 @@
- }
- 
- func (cc *conn) configConn(db int, password string) os.Error {
--    if db != 0 {
--        buf := [][]byte{[]byte("SELECT"), []byte(strconv.Itoa(db))}
-+    if password != "" {
-+        buf := [][]byte{[]byte("AUTH"), []byte(password)}
-         _, err := cc.rwc.Write(buildCmd(buf))
- 
-         if err != nil {
-@@ -356,8 +356,8 @@
-         }
-     }
- 
--    if password != "" {
--        buf := [][]byte{[]byte("AUTH"), []byte(password)}
-+    if db != 0 {
-+        buf := [][]byte{[]byte("SELECT"), []byte(strconv.Itoa(db))}
-         _, err := cc.rwc.Write(buildCmd(buf))
- 
-         if err != nil {
\ No newline at end of file
diff --git a/databases/godis/pkg-plist b/databases/godis/pkg-plist
new file mode 100644
index 000000000000..467936bf8bf3
--- /dev/null
+++ b/databases/godis/pkg-plist
@@ -0,0 +1,9 @@
+%%GO_LIBDIR%%/github.com/simonz05/godis.a
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/godis.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/commands.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/conn.go
+@dirrmtry %%GO_LIBDIR%%/github.com/simonz05
+@dirrmtry %%GO_LIBDIR%%/github.com
+@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%
+@dirrmtry %%GO_SRCDIR%%/github.com/simonz05
+@dirrmtry %%GO_SRCDIR%%/github.com