diff --git a/configure.ac b/configure.ac
index 13c3d584984a57751e15e9407cb228263ae999d8..de3d8ff1f39debf90727d50037becce4e406a822 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 #	You should have received a copy of the GNU General Public License
 #	along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
 #
-#	Last modified:		20/06/2017
+#	Last modified:		21/06/2017
 #
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],)
 define([AC_CACHE_SAVE],)
 
 # This is your standard Bertin source code...
-AC_INIT(SExtractor, 2.24.1,[astromatic@astromatic.net],
+AC_INIT(SExtractor, 2.24.2,[astromatic@astromatic.net],
 	sextractor, [http://astromatic.net/software/sextractor])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR(autoconf)
@@ -244,7 +244,7 @@ if test "$enable_model_fitting" != "no"; then
 ############ handle the INTEL MKL library (FFTW + LAPACKe) ###########
   if test "$enable_mkl" = "yes"; then
     convlibs="${srcdir}/wcs/libwcs_c.a,${srcdir}/levmar/liblevmar.a"
-    ACX_MKL($with_mkl_dir,yes,$enable_best_link,$convlibs)
+    ACX_MKL($with_mkl_dir,,$enable_best_link,$convlibs)
     if test "$MKL_WARN" == ""; then
       AC_MSG_RESULT([yes])
     else
diff --git a/doc/src/conf.py b/doc/src/conf.py
index 713572baa07d22fd7961a44ad0f915addbccfa83..1ac38b0ce7c23323caf2decaccd87670f5dcefe2 100644
--- a/doc/src/conf.py
+++ b/doc/src/conf.py
@@ -67,9 +67,9 @@ author = u'E. Bertin'
 # built documents.
 #
 # The short X.Y version.
-version = '2.24.0'
+version = '2.24.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.24.0'
+release = '2.24.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -81,7 +81,7 @@ language = None
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
 #
-today = 'Tue Jun 20 2017'
+today = 'Wed Jun 21 2017'
 #
 # Else, today_fmt is used as the format for a strftime call.
 #
@@ -144,7 +144,7 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
 #
-# html_title = u'SExtractor v2.24.0'
+# html_title = u'SExtractor v2.24.2'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #
diff --git a/man/sex.1 b/man/sex.1
index 47ef4a4095a24f15e8957189e792910967ae053e..4cc34365a48a743263eedc35d55fec58dedfe82a 100644
--- a/man/sex.1
+++ b/man/sex.1
@@ -1,4 +1,4 @@
-.TH SEXTRACTOR "1" "June 2017" "SExtractor 2.24.0" "User Commands"
+.TH SEXTRACTOR "1" "June 2017" "SExtractor 2.24.2" "User Commands"
 .SH NAME
 sex \- extract a source catalogue from an astronomical FITS image
 .SH SYNOPSIS
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4686bc4623c8d6e51f06edecf91b860c430acd73..2b1a1122d796880df7d026681f10319899395cc8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,8 @@
 # Test Makefile for SExtractor
-# Copyright (C) 2007 Emmanuel Bertin.
-TESTS		= efigi1.test
+# Copyright (C) 2007-2017 Emmanuel Bertin.
+TESTS		= modelfit.test
 EXTRA_DIST	= galaxies.fits galaxies.weight.fits \
 		  default.psf default.sex default.param \
-		  default.conv efigi1.test
+		  gauss_4.0_7x7.conv modelfit.test
 distclean-local:
 		-rm *.cat *.xml
diff --git a/tests/default.conv b/tests/default.conv
deleted file mode 100644
index 2590b9cba71399a05c5487e7a7441843f0fdb10b..0000000000000000000000000000000000000000
--- a/tests/default.conv
+++ /dev/null
@@ -1,5 +0,0 @@
-CONV NORM
-# 3x3 ``all-ground'' convolution mask with FWHM = 2 pixels.
-1 2 1
-2 4 2
-1 2 1
diff --git a/tests/default.param b/tests/default.param
index 2253a09f1f630b9b4e127bf419116bcd5df21859..fc87e0439562abdd3e9bd88f753b829f415f9353 100644
--- a/tests/default.param
+++ b/tests/default.param
@@ -3,14 +3,14 @@ X_IMAGE
 Y_IMAGE
 XWIN_IMAGE
 YWIN_IMAGE
-#XMODEL_IMAGE
-#YMODEL_IMAGE
+XMODEL_IMAGE
+YMODEL_IMAGE
 MAG_AUTO
-#MAG_MODEL
+MAG_MODEL
 FLUX_RADIUS
 FLAGS
 FLAGS_WIN
 NITER_WIN
-#SPREAD_MODEL
-#SPREADERR_MODEL
+SPREAD_MODEL
+SPREADERR_MODEL
 ID_PARENT
diff --git a/tests/gauss_4.0_7x7.conv b/tests/gauss_4.0_7x7.conv
new file mode 100644
index 0000000000000000000000000000000000000000..001efd0379b9f7f17bb7316fbe51c7044b1abae8
--- /dev/null
+++ b/tests/gauss_4.0_7x7.conv
@@ -0,0 +1,9 @@
+CONV NORM
+# 7x7 convolution mask of a gaussian PSF with FWHM = 4.0 pixels.
+0.047454 0.109799 0.181612 0.214776 0.181612 0.109799 0.047454
+0.109799 0.254053 0.420215 0.496950 0.420215 0.254053 0.109799
+0.181612 0.420215 0.695055 0.821978 0.695055 0.420215 0.181612
+0.214776 0.496950 0.821978 0.972079 0.821978 0.496950 0.214776
+0.181612 0.420215 0.695055 0.821978 0.695055 0.420215 0.181612
+0.109799 0.254053 0.420215 0.496950 0.420215 0.254053 0.109799
+0.047454 0.109799 0.181612 0.214776 0.181612 0.109799 0.047454
diff --git a/tests/efigi1.test b/tests/modelfit.test
similarity index 100%
rename from tests/efigi1.test
rename to tests/modelfit.test