diff --git a/devel/jam/Makefile b/devel/jam/Makefile
index 265c01f8f298..3dd39107cb85 100644
--- a/devel/jam/Makefile
+++ b/devel/jam/Makefile
@@ -2,15 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	jam
-PORTVERSION=	2.5
-PORTREVISION=	2
+PORTVERSION=	2.6
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.perforce.com/jam/
+MASTER_SITES=	https://swarm.workshop.perforce.com/projects/perforce_software-jam/download/main/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Build utility like make(1)
 
-NO_WRKSUBDIR=	yes
 USES=		zip
 
 OPTIONS_DEFINE=	DOCS
diff --git a/devel/jam/distinfo b/devel/jam/distinfo
index aed615dd3ebb..8f26ade17c70 100644
--- a/devel/jam/distinfo
+++ b/devel/jam/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jam-2.5.zip) = 66b9b307d2f9217d476ec1437cdce8b3715b08f183bb32299c40b2ca265c0498
-SIZE (jam-2.5.zip) = 191864
+SHA256 (jam-2.6.zip) = 7c510be24dc9d0912886c4364dc17a013e042408386f6b937e30bd9928d5223c
+SIZE (jam-2.6.zip) = 199995
diff --git a/devel/jam/files/patch-Jamfile b/devel/jam/files/patch-Jamfile
index 5ea042c6b001..38074b2ef60f 100644
--- a/devel/jam/files/patch-Jamfile
+++ b/devel/jam/files/patch-Jamfile
@@ -1,5 +1,5 @@
---- Jamfile.orig	Thu Aug 19 15:19:29 2004
-+++ Jamfile	Fri Aug 26 17:10:28 2005
+--- Jamfile.orig	2014-08-07 18:24:14 UTC
++++ Jamfile
 @@ -7,7 +7,7 @@
  
  if $(VMS) 	{ LOCATE_TARGET ?= [.binvms] ; }
diff --git a/devel/jam/files/patch-Makefile b/devel/jam/files/patch-Makefile
index 60ee544008e8..4d3cd30582ee 100644
--- a/devel/jam/files/patch-Makefile
+++ b/devel/jam/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Wed Apr 23 01:45:50 2003
-+++ Makefile	Fri Aug 26 17:17:13 2005
+--- Makefile.orig	2014-08-07 18:24:14 UTC
++++ Makefile
 @@ -1,7 +1,5 @@
  # Makefile for jam