diff --git a/CHANGES.ugenk b/CHANGES.ugenk
index 92d4971..e3bf80c 100644
--- a/CHANGES.ugenk
+++ b/CHANGES.ugenk
@@ -41,4 +41,4 @@
  + some changes in autoconf
  * added Type to nlookup
  * fixed 'Ñ' in FAQ
- 
\ No newline at end of file
+ * added buggy-emsi option in configure. use it in case of problems with stupid mailers
diff --git a/source/ChangeLog b/source/ChangeLog
index afae3bb..d6c5fd8 100644
--- a/source/ChangeLog
+++ b/source/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-23  Evgeniy Kozhuhovskiy  <e.kozhuhovskiy@gmail.com>
+
+	* bforce/prot_emsi.c (sm_rx_waitseq): reviewed code for buggy-emsi option
+
+	* configure.in: added --disable-buggy-emsi option for stupid mailers
+
 2005-06-05  Evgeniy Kozhuhovskiy  <e.kozhuhovskiy@gmail.com>
 
 	* configure.in: added logdir and spooldir to ./configure
diff --git a/source/bforce/prot_emsi.c b/source/bforce/prot_emsi.c
index ab72163..76585f9 100644
--- a/source/bforce/prot_emsi.c
+++ b/source/bforce/prot_emsi.c
@@ -419,10 +419,12 @@ static int sm_rx_waitseq(s_rx_emsidat *d)
 					 */
 					return SM3;
 				}
+#ifndef BUGGY_EMSI			      
 				else if( !strncasecmp(d->buf, "EMSI_INQC816", 12) )
 				{
 				        return SM1;
 				}
+#endif /*BUGGY_EMSI*/				
 				else
 				{
 					DEB((D_HSHAKE, "got unexpected emsi sequence: \"%s\"",
diff --git a/source/configure b/source/configure
index c0282cb..ee2d112 100755
--- a/source/configure
+++ b/source/configure
@@ -855,6 +855,7 @@ Optional Features:
  --enable-log-passwd      write session password to log (default)
  --enable-csy-locks       use '.csy' locks while dialing (default)
  --enable-syslog		use syslog for logging experimental (default)
+ --disable-buggy-emsi	disable buggy emsi support (default)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1603,6 +1604,24 @@ _ACEOF
 
 fi;
 
+# Check whether --enable-buggy_emsi or --disable-buggy_emsi was given.
+if test "${enable_buggy_emsi+set}" = set; then
+  enableval="$enable_buggy_emsi"
+  if test $enableval = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define BUGGY_EMSI 1
+_ACEOF
+
+	fi
+else
+
+cat >>confdefs.h <<\_ACEOF
+#define BUGGY_EMSI 0
+_ACEOF
+
+fi;
+
 
 # Check whether --with-uucp-lockdir or --without-uucp-lockdir was given.
 if test "${with_uucp_lockdir+set}" = set; then
diff --git a/source/configure.in b/source/configure.in
index 6f1f4d3..2237457 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -82,6 +82,11 @@ AC_ARG_ENABLE(syslog,       [ --enable-syslog		use syslog for logging [experimen
 		AC_DEFINE([USE_SYSLOG], [1], [Use syslog for logging])
 	fi], [AC_DEFINE([USE_SYSLOG], [1], [Use syslog for logging])])
 
+AC_ARG_ENABLE(buggy_emsi,   [ --disable-buggy-emsi	disable buggy emsi support (default)],
+	[if test $enableval = yes; then
+		AC_DEFINE([BUGGY_EMSI], [1], [Disable buggy emsi])
+	fi], [AC_DEFINE([BUGGY_EMSI], [0], [Enable buggy emsi])])
+
 AC_ARG_WITH(uucp-lockdir,       [ --with-uucp-lockdir      specify directory for UUCP style locks],
 	[AC_DEFINE_UNQUOTED(BFORCE_LOCK_DIR, "$withval")],
 	[AC_MSG_CHECKING("UUCP lock files directory")
diff --git a/source/include/config.h.in b/source/include/config.h.in
index 8b0bd1b..bfe4224 100644
--- a/source/include/config.h.in
+++ b/source/include/config.h.in
@@ -145,3 +145,6 @@
 
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
+
+/* Define if you want buggy emsi :) */
+#undef BUGGY_EMSI