diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog
index 710c4581d8..6d902aaf98 100644
--- a/legacy/evil/ChangeLog
+++ b/legacy/evil/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-06  Vincent Torri  <doursse at users dot sf dot net>
+
+	* src/lib/evil_string.c:
+	add strrstr() function.
+
+	* src/bin/evil_suite.c:
+	* src/lib/evil_fnmatch.c:
+	* src/lib/evil_fnmatch_list_of_states.c:
+	include config.h
+
 2009-10-08  Vincent Torri  <doursse at users dot sf dot net>
 
 	* src/lib/evil_main.c:
diff --git a/legacy/evil/src/bin/evil_suite.c b/legacy/evil/src/bin/evil_suite.c
index f9e62e05ac..190362ebec 100644
--- a/legacy/evil/src/bin/evil_suite.c
+++ b/legacy/evil/src/bin/evil_suite.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/legacy/evil/src/bin/evil_test_memcpy.c b/legacy/evil/src/bin/evil_test_memcpy.c
index 9dca042e32..0adfe373f0 100644
--- a/legacy/evil/src/bin/evil_test_memcpy.c
+++ b/legacy/evil/src/bin/evil_test_memcpy.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -6,10 +9,6 @@
 #include <windows.h>
 #undef WIN32_LEAN_AND_MEAN
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif /* HAVE_CONFIG_H */
-
 #include "evil_suite.h"
 #include "evil_test_memcpy.h"
 
diff --git a/legacy/evil/src/lib/evil_fnmatch.c b/legacy/evil/src/lib/evil_fnmatch.c
index 000b646d91..649cc1961f 100644
--- a/legacy/evil/src/lib/evil_fnmatch.c
+++ b/legacy/evil/src/lib/evil_fnmatch.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #if defined (_MSC_VER) || defined (__MINGW32__) || defined (__MINGW32CE__)
 
 #include <assert.h>
diff --git a/legacy/evil/src/lib/evil_fnmatch_list_of_states.c b/legacy/evil/src/lib/evil_fnmatch_list_of_states.c
index a9e1f416e3..3ccf7b31ca 100644
--- a/legacy/evil/src/lib/evil_fnmatch_list_of_states.c
+++ b/legacy/evil/src/lib/evil_fnmatch_list_of_states.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #if defined (_MSC_VER) || defined (__MINGW32__) || defined (__MINGW32CE__)
 
 #include <assert.h>
diff --git a/legacy/evil/src/lib/evil_langinfo.c b/legacy/evil/src/lib/evil_langinfo.c
index 68cf0d615b..7554b10a6a 100644
--- a/legacy/evil/src/lib/evil_langinfo.c
+++ b/legacy/evil/src/lib/evil_langinfo.c
@@ -1,4 +1,3 @@
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif /* HAVE_CONFIG_H */
diff --git a/legacy/evil/src/lib/evil_main.c b/legacy/evil/src/lib/evil_main.c
index 03059bbea3..77fe75e0c1 100644
--- a/legacy/evil/src/lib/evil_main.c
+++ b/legacy/evil/src/lib/evil_main.c
@@ -2,7 +2,6 @@
 # include <config.h>
 #endif
 
-
 # define WIN32_LEAN_AND_MEAN
 # include <winsock2.h>
 # undef WIN32_LEAN_AND_MEAN
diff --git a/legacy/evil/src/lib/evil_pwd.c b/legacy/evil/src/lib/evil_pwd.c
index 56eaae9910..859e1cb664 100644
--- a/legacy/evil/src/lib/evil_pwd.c
+++ b/legacy/evil/src/lib/evil_pwd.c
@@ -1,5 +1,3 @@
-
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif /* HAVE_CONFIG_H */
diff --git a/legacy/evil/src/lib/evil_stdio.c b/legacy/evil/src/lib/evil_stdio.c
index 59c8752465..78ddc17a56 100644
--- a/legacy/evil/src/lib/evil_stdio.c
+++ b/legacy/evil/src/lib/evil_stdio.c
@@ -1,4 +1,3 @@
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif /* HAVE_CONFIG_H */
diff --git a/legacy/evil/src/lib/evil_stdlib.c b/legacy/evil/src/lib/evil_stdlib.c
index 06b1ecd869..325763bf99 100644
--- a/legacy/evil/src/lib/evil_stdlib.c
+++ b/legacy/evil/src/lib/evil_stdlib.c
@@ -1,4 +1,3 @@
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif /* HAVE_CONFIG_H */
diff --git a/legacy/evil/src/lib/evil_string.c b/legacy/evil/src/lib/evil_string.c
index 0b74f1c5fc..c9b2933803 100644
--- a/legacy/evil/src/lib/evil_string.c
+++ b/legacy/evil/src/lib/evil_string.c
@@ -1,4 +1,3 @@
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif /* HAVE_CONFIG_H */
@@ -74,4 +73,17 @@ strcoll (const char *s1, const char *s2)
 #endif /* ! UNICODE */
 }
 
+
 #endif /* _WIN32_WCE */
+
+char *
+strrstr (const char *str, const char *substr)
+{
+  char *it;
+  char *ret = NULL;
+
+  while ((it = strstr(str, substr)))
+    ret = it;
+
+  return ret;
+}
diff --git a/legacy/evil/src/lib/evil_string.h b/legacy/evil/src/lib/evil_string.h
index 806af3a5d3..e217d026e8 100644
--- a/legacy/evil/src/lib/evil_string.h
+++ b/legacy/evil/src/lib/evil_string.h
@@ -90,6 +90,23 @@ EAPI int strcoll (const char *s1, const char *s2);
 
 #endif /* _WIN32_WCE */
 
+/**
+ * @brief get the last substring occurence.
+ *
+ * @param str The string to search from.
+ * @param substr The substring to search.
+ * @return The last occurrence of the substring if found, @c NULL otherwise.
+ *
+ * This function retrieves the last occurrence of @p substring in the
+ * string @p str. If @p str or @p substr are @c NULL, of if @p substr
+ * is not found in @p str, @c NULL is returned.
+ *
+ * Conformity: Non applicable.
+ *
+ * Supported OS: Windows XP, Windows CE.
+ */
+EAPI char *strrstr (const char *str, const char *substr);
+
 
 /**
  * @}
diff --git a/legacy/evil/src/lib/evil_unistd.c b/legacy/evil/src/lib/evil_unistd.c
index 6628137637..e22dfabf02 100644
--- a/legacy/evil/src/lib/evil_unistd.c
+++ b/legacy/evil/src/lib/evil_unistd.c
@@ -1,4 +1,3 @@
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif /* HAVE_CONFIG_H */