diff --git a/ChangeLog b/ChangeLog
index e4e69eefc..ce93effa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-29  Pavel Roskin  <proski@gnu.org>
+
+	* acinclude.m4 (MC_WITH_SLANG): Reject S-Lang with UTF-8
+	support, unless external S-Lang was explicitly requested.
+
 2002-10-24  Pavel Roskin  <proski@gnu.org>
 
 	* lib/mc.ext.in: Don't use links to view html - the "-dump"
diff --git a/acinclude.m4 b/acinclude.m4
index 449d4023f..86146b12b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -657,6 +657,13 @@ AC_DEFUN([MC_WITH_SLANG], [
     AC_CHECK_LIB([slang], [SLang_init_tty], [MCLIBS="$MCLIBS -lslang"],
 		 [with_screen=mcslang])
 
+    dnl Unless external S-Lang was requested, reject S-Lang with UTF-8 hacks
+    m4_if([$1], strict, ,
+	  [AC_CHECK_LIB([slang], [SLsmg_write_nwchars],
+			[AC_MSG_WARN([Rejecting S-Lang with UTF-8 support, \
+it doesn't work well])
+			with_screen=mcslang])])
+
     dnl Check the header
     if test x$with_screen = xslang; then
 	slang_h_found=