diff --git a/databases/ip4r/Makefile b/databases/ip4r/Makefile
index 706d579383e6..994f44f6f597 100644
--- a/databases/ip4r/Makefile
+++ b/databases/ip4r/Makefile
@@ -1,10 +1,9 @@
 # Created by: Ade Lovett <ade@FreeBSD.org>
-# $FreeBSD$
+# $FreeBSD: head/databases/ip4r/Makefile 361022 2014-07-07 05:27:17Z pi $
 
 PORTNAME=	ip4r
-PORTVERSION=	2.0
+PORTVERSION=	2.2
 CATEGORIES=	databases net
-MASTER_SITES=	http://pgfoundry.org/frs/download.php/3380/
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	IP address and IP range index types for PostgreSQL
@@ -21,20 +20,11 @@ MAKE_ARGS=	USE_PGXS=1
 
 .if ${PORT_OPTIONS:MIDXPATCH}
 # Patch if the option is supplied, however we need to unpatch if the option is de-selected after previously selecting (TODO)
-PATCH_SITES=	http://www.sorbs.net/home/:SORBS
-PATCHFILES=	ip4r-2.x-SORBS-prefer-index.patch:-p1:SORBS
+PATCH_SITES=	https://raw.githubusercontent.com/amutu/patch/master/:SORBS
+PATCHFILES=	ip4r-2.2-SORBS-prefer-index.patch:-p1:SORBS
 .endif
 
-# In order to make this port PREFIX-safe, we override the install target
-# and install the three files manually
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/postgresql
-	@${INSTALL_LIB} -m ${BINMODE} ${WRKSRC}/ip4r.so ${STAGEDIR}${PREFIX}/lib/postgresql
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql/contrib
-	@${INSTALL_DATA} ${WRKSRC}/ip4r.sql \
-		${STAGEDIR}${PREFIX}/share/postgresql/contrib
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/postgresql/contrib
-	@${INSTALL_DATA} ${WRKSRC}/README.ip4r \
-		${STAGEDIR}${PREFIX}/share/doc/postgresql/contrib
+USE_GITHUB=	yes
+GH_ACCOUNT=	RhodiumToad
 
 .include <bsd.port.mk>
diff --git a/databases/ip4r/distinfo b/databases/ip4r/distinfo
index 8d78aa9de2fe..790e1b1e6665 100644
--- a/databases/ip4r/distinfo
+++ b/databases/ip4r/distinfo
@@ -1,4 +1,5 @@
-SHA256 (ip4r-2.0.tar.gz) = 251e70d12fc1244aab1707d3db0fe9f821ab224765e34cd8f2fb66ee3468a957
-SIZE (ip4r-2.0.tar.gz) = 93007
-SHA256 (ip4r-2.x-SORBS-prefer-index.patch) = 4c10dcb0c31b6abe012597fc7826ccff2611c8ef256bbc5d448633cfb3b60427
-SIZE (ip4r-2.x-SORBS-prefer-index.patch) = 9221
+TIMESTAMP = 1496567402
+SHA256 (RhodiumToad-ip4r-2.2_GH0.tar.gz) = b513ca2f5e71c33b82566096e9b0ed420405845ed5ac396936ef676527074dc3
+SIZE (RhodiumToad-ip4r-2.2_GH0.tar.gz) = 103362
+SHA256 (ip4r-2.2-SORBS-prefer-index.patch) = 7f0740c8278dc01964323e74683a7d1e43bc761e8698201aee60da479b8d5b41
+SIZE (ip4r-2.2-SORBS-prefer-index.patch) = 9160
diff --git a/databases/ip4r/pkg-descr b/databases/ip4r/pkg-descr
index a4a0dcce4832..25c4c1b2f7e2 100644
--- a/databases/ip4r/pkg-descr
+++ b/databases/ip4r/pkg-descr
@@ -3,4 +3,4 @@ existing 'inet' and 'cidr' built-in types, providing extra functionality
 and simplicity to IPv4 and IPv6 address lookup within large-scale
 environments.
 
-WWW: http://pgfoundry.org/projects/ip4r/
+WWW: https://github.com/RhodiumToad/ip4r
diff --git a/databases/ip4r/pkg-plist b/databases/ip4r/pkg-plist
index f710c8741ee3..a963eababa13 100644
--- a/databases/ip4r/pkg-plist
+++ b/databases/ip4r/pkg-plist
@@ -1,3 +1,9 @@
 lib/postgresql/ip4r.so
-share/doc/postgresql/contrib/README.ip4r
-share/postgresql/contrib/ip4r.sql
+share/doc/postgresql/extension/README.ip4r
+share/postgresql/extension/ip4r--2.0--2.1.sql
+share/postgresql/extension/ip4r--2.1--2.2.sql
+share/postgresql/extension/ip4r--2.2.sql
+share/postgresql/extension/ip4r--unpackaged1--2.0.sql
+share/postgresql/extension/ip4r--unpackaged2.0--2.0.sql
+share/postgresql/extension/ip4r--unpackaged2.1--2.1.sql
+share/postgresql/extension/ip4r.control