diff --git a/ChangeLog b/ChangeLog
index 9751f7be..ea7e65a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-13  Benno Schulenberg  <bensberg@justemail.net>
+	* src/search.c (regexp_init): Allow using the word boundary markers
+	\< and \> in search strings on non-GNU systems.  This is a partial
+	fix for Savannah bug #47325 reported by Thomas Rosenau.
+
 2016-03-13  Thomas Rosenau  <thomasr@fantasymail.de>  (tiny change)
 	* autogen.sh, README.SVN: Mention SVN instead of CVS.
 
diff --git a/src/search.c b/src/search.c
index b94e5b4e..48ffb9f5 100644
--- a/src/search.c
+++ b/src/search.c
@@ -48,7 +48,7 @@ bool regexp_init(const char *regexp)
 
     assert(!regexp_compiled);
 
-    rc = regcomp(&search_regexp, regexp, REG_EXTENDED
+    rc = regcomp(&search_regexp, fixbounds(regexp), REG_EXTENDED
 #ifndef NANO_TINY
 	| (ISSET(CASE_SENSITIVE) ? 0 : REG_ICASE)
 #endif