diff --git a/CHANGES.current b/CHANGES.current
index 37d85a816b3..4c5ef680e19 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.9 (in progress)
 ===========================
 
+2016-03-01: olly
+	    [Python] Fix isfinite() check to work with GCC6.  Fixes
+	    https://github.com/swig/swig/issues/615 reported by jplesnik.
+
 2016-02-17: olly
 	    [Python] Add missing keywords 'as' and 'with' to pythonkw.swg.
 
diff --git a/Lib/typemaps/fragments.swg b/Lib/typemaps/fragments.swg
index 447df6e2e26..203cd53b9db 100644
--- a/Lib/typemaps/fragments.swg
+++ b/Lib/typemaps/fragments.swg
@@ -168,7 +168,8 @@
 %fragment("SWIG_isfinite","header",fragment="<math.h>,<float.h>") %{
 /* Getting isfinite working pre C99 across multiple platforms is non-trivial. Users can provide SWIG_isfinite on older platforms. */
 #ifndef SWIG_isfinite
-# if defined(isfinite)
+/* isfinite() is a macro for C99, but a function for C++11. */
+# if defined(isfinite) || (defined __cplusplus && __cplusplus >= 201103L)
 #  define SWIG_isfinite(X) (isfinite(X))
 # elif defined(_MSC_VER)
 #  define SWIG_isfinite(X) (_finite(X))