diff -ruN csmith.orig/Makefile csmith/Makefile
--- csmith.orig/Makefile	2015-01-01 19:55:34.000000000 +0100
+++ csmith/Makefile	2015-01-01 20:27:57.000000000 +0100
@@ -1,12 +1,12 @@
 # $FreeBSD: head/devel/csmith/Makefile 375270 2014-12-22 21:23:30Z antoine $
 
 PORTNAME=	csmith
-PORTVERSION=	2.1.0
-PORTREVISION=	2
+PORTVERSION=	2.2.0
 CATEGORIES=	devel
-MASTER_SITES=	http://embed.cs.utah.edu/csmith/
+MASTER_SITES=	http://embed.cs.utah.edu/csmith/ \
+		http://www.skysmurf.nl/comp/FreeBSD/distfiles/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd@skysmurf.nl
 COMMENT=	Generates random C programs that conform to the C99 standard
 
 LICENSE=	BSD2CLAUSE
@@ -25,4 +25,14 @@
 
 OPTIONS_DEFINE=	DOCS
 
+PLIST_SUB=	PKGNAME="${PKGNAME}"
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/probabilities.txt ${STAGEDIR}${DOCSDIR}
+.endif
+
 .include <bsd.port.mk>
diff -ruN csmith.orig/distinfo csmith/distinfo
--- csmith.orig/distinfo	2015-01-01 19:55:34.000000000 +0100
+++ csmith/distinfo	2015-01-01 19:55:49.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (csmith-2.1.0.tar.gz) = d5f626044dbe93bfadd867385dc03b111b91ead1e394793a4203dd7de4f50192
-SIZE (csmith-2.1.0.tar.gz) = 575381
+SHA256 (csmith-2.2.0.tar.gz) = 62fd96d3a5228241d4f3159511ad3ff5b8c4cedb9e9a82adc935830b421c8e37
+SIZE (csmith-2.2.0.tar.gz) = 622362
diff -ruN csmith.orig/pkg-plist csmith/pkg-plist
--- csmith.orig/pkg-plist	2015-01-01 19:55:34.000000000 +0100
+++ csmith/pkg-plist	2015-01-01 20:30:58.000000000 +0100
@@ -3,25 +3,25 @@
 bin/csmith
 bin/launchn.pl
 bin/test_csmith.pl
-include/csmith-2.1.0/csmith.h
-include/csmith-2.1.0/csmith_minimal.h
-include/csmith-2.1.0/custom_limits.h
-include/csmith-2.1.0/custom_stdint_x86.h
-include/csmith-2.1.0/platform_avr.h
-include/csmith-2.1.0/platform_generic.h
-include/csmith-2.1.0/platform_msp430.h
-include/csmith-2.1.0/random_inc.h
-include/csmith-2.1.0/safe_abbrev.h
-include/csmith-2.1.0/safe_math.h
-include/csmith-2.1.0/safe_math_macros.h
-include/csmith-2.1.0/safe_math_macros_notmp.h
-include/csmith-2.1.0/stdint_avr.h
-include/csmith-2.1.0/stdint_ia32.h
-include/csmith-2.1.0/stdint_ia64.h
-include/csmith-2.1.0/stdint_msp430.h
-include/csmith-2.1.0/volatile_runtime.c
-include/csmith-2.1.0/volatile_runtime.h
-include/csmith-2.1.0/windows/stdint.h
+include/%%PKGNAME%%/csmith.h
+include/%%PKGNAME%%/csmith_minimal.h
+include/%%PKGNAME%%/custom_limits.h
+include/%%PKGNAME%%/custom_stdint_x86.h
+include/%%PKGNAME%%/platform_avr.h
+include/%%PKGNAME%%/platform_generic.h
+include/%%PKGNAME%%/platform_msp430.h
+include/%%PKGNAME%%/random_inc.h
+include/%%PKGNAME%%/safe_abbrev.h
+include/%%PKGNAME%%/safe_math.h
+include/%%PKGNAME%%/safe_math_macros.h
+include/%%PKGNAME%%/safe_math_macros_notmp.h
+include/%%PKGNAME%%/stdint_avr.h
+include/%%PKGNAME%%/stdint_ia32.h
+include/%%PKGNAME%%/stdint_ia64.h
+include/%%PKGNAME%%/stdint_msp430.h
+include/%%PKGNAME%%/volatile_runtime.c
+include/%%PKGNAME%%/volatile_runtime.h
+include/%%PKGNAME%%/windows/stdint.h
 lib/libcsmith.a
 lib/libcsmith.so
 lib/libcsmith.so.0