diff --git a/build-aux/config.make.in b/build-aux/config.make.in
index a511daa2..45947ef8 100644
--- a/build-aux/config.make.in
+++ b/build-aux/config.make.in
@@ -29,11 +29,8 @@ GUILE_EFFECTIVE_VERSION:=@GUILE_EFFECTIVE_VERSION@
 GUIX:=@GUIX@
 HELP2MAN:=@HELP2MAN@
 HEX2:=@HEX2@
-#HEX2FLAGS:=@HEX2FLAGS@
 MAKEINFO:=@MAKEINFO@
 M1:=@M1@
-#M1FLAGS:=@M1FLAGS@
-MES:=@MES@
 MES_FOR_BUILD:=@MES_FOR_BUILD@
 MES_SEED:=@MES_SEED@
 NYACC:=@NYACC@
@@ -41,8 +38,8 @@ PACKAGE:=@PACKAGE@
 PACKAGE_NAME:=@PACKAGE_NAME@
 PACKAGE_BUGREPORT:=@PACKAGE_BUGREPORT@
 PERL:=@PERL@
+SCHEME:=@SCHEME@
 SHELL:=@SHELL@
-TINYCC_PREFIX:=@TINYCC_PREFIX@
 VERSION:=@VERSION@
 V:=@V@
 colors:=@colors@
diff --git a/build-aux/config.sh.in b/build-aux/config.sh.in
index 0b2bd822..56eccf94 100644
--- a/build-aux/config.sh.in
+++ b/build-aux/config.sh.in
@@ -30,10 +30,8 @@ GUILE_EFFECTIVE_VERSION="@GUILE_EFFECTIVE_VERSION@"
 GUIX="@GUIX@"
 HELP2MAN="@HELP2MAN@"
 HEX2="@HEX2@"
-#HEX2FLAGS="@HEX2FLAGS@"
 MAKEINFO="@MAKEINFO@"
 M1="@M1@"
-#M1FLAGS="@M1FLAGS@"
 MES_FOR_BUILD="@MES_FOR_BUILD@"
 MES_SEED="@MES_SEED@"
 NYACC="@NYACC@"
@@ -41,6 +39,7 @@ PACKAGE="@PACKAGE@"
 PACKAGE_NAME="@PACKAGE_NAME@"
 PACKAGE_BUGREPORT="@PACKAGE_BUGREPORT@"
 PERL="@PERL@"
+#SCHEME="@SCHEME@"
 SHELL="@SHELL@"
 TINYCC_PREFIX="@TINYCC_PREFIX@"
 VERSION="@VERSION@"
diff --git a/build-aux/export.make b/build-aux/export.make
index ed4394be..f3807af7 100644
--- a/build-aux/export.make
+++ b/build-aux/export.make
@@ -115,6 +115,10 @@ ifdef PERL
 export PERL
 endif
 
+ifdef SCHEME
+export SCHEME
+endif
+
 ifdef SHELL
 export SHELL
 endif
diff --git a/configure b/configure
index 3d85a6c3..39c00f5c 100755
--- a/configure
+++ b/configure
@@ -598,6 +598,8 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system)
                                                guile))
                      ("@MES_SEED@" . ,(or mes-seed ""))
                      ("@PERL@" . ,(or (file-name "perl" deps) ""))
+                     ("#SCHEME=\"@SCHEME@\"" . ,(if with-cheating? (string-append "\nSCHEME=\"" guile "\"") ""))
+                     ("@SCHEME@" . ,(if with-cheating? guile ""))
                      ("@SHELL@" . ,(or (file-name "bash" deps)
                                        (file-name "sh" deps)
                                        "sh"))