diff --git a/math/calc/Makefile b/math/calc/Makefile
index f07dd2c1797..acfc069bab1 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -1,6 +1,6 @@
 COMMENT=	C-style arbitrary precision calculator
 
-V=		2.16.1.3
+V=		2.17.0.0
 DISTNAME=	calc-$V
 EXTRACT_SUFX=	.tar.bz2
 
@@ -14,13 +14,16 @@ MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 
 HOMEPAGE=	http://www.isthe.com/chongo/tech/comp/calc
 
+SITES=	https://github.com/lcn2/calc/releases/download/v$V/ \
+	http://www.isthe.com/chongo/src/calc/
+
 # LGPLv2.1
 PERMIT_PACKAGE=	Yes
 
 WANTLIB += c curses readline
 
-SITES=	https://github.com/lcn2/calc/releases/download/v$V/ \
-	http://www.isthe.com/chongo/src/calc/
+COMPILER=	base-clang ports-gcc
+COMPILER_LANGS=	c
 
 MAKE_FLAGS= Q="" \
 	BINDIR='$${DESTDIR}${PREFIX}/bin' \
diff --git a/math/calc/distinfo b/math/calc/distinfo
index 7f0cbfc119b..50d8789472e 100644
--- a/math/calc/distinfo
+++ b/math/calc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (calc-2.16.1.3.tar.bz2) = KXW0ZCuDmunJLzL4GP78f/q1aDiCxJv6vTdVS8/5mWE=
-SIZE (calc-2.16.1.3.tar.bz2) = 1046014
+SHA256 (calc-2.17.0.0.tar.bz2) = Cso4Z8E5UBsoXCluuujZ+4Slppb5k6K+EDRPKKrqrDk=
+SIZE (calc-2.17.0.0.tar.bz2) = 1041459
diff --git a/math/calc/patches/patch-Makefile b/math/calc/patches/patch-Makefile
index 10879a73ab2..fd7935d367c 100644
--- a/math/calc/patches/patch-Makefile
+++ b/math/calc/patches/patch-Makefile
@@ -1,7 +1,7 @@
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -536,7 +536,7 @@ calc.1: calc.man ${MK_SET}
+@@ -659,7 +659,7 @@ calc.1: calc.man ${MK_SET}
  calc.usage: calc.1
  	${Q} echo forming $@ from calc.1
  	${RM} -f $@
diff --git a/math/calc/pkg/PLIST b/math/calc/pkg/PLIST
index 6e35c256446..f95ba48fc31 100644
--- a/math/calc/pkg/PLIST
+++ b/math/calc/pkg/PLIST
@@ -9,19 +9,16 @@ bin/cscript/powerterm
 bin/cscript/simple
 bin/cscript/square
 include/calc/
-include/calc/alloc.h
 include/calc/attribute.h
 include/calc/banned.h
 include/calc/blkcpy.h
 include/calc/block.h
-include/calc/bool.h
 include/calc/byteswap.h
 include/calc/calc.h
 include/calc/cmath.h
 include/calc/config.h
 include/calc/custom/
 include/calc/custom.h
-include/calc/decl.h
 include/calc/errtbl.h
 include/calc/file.h
 include/calc/func.h