diff --git a/ChangeLog b/ChangeLog
index fbb3bb27..cb35fdd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 (Format: Year/Month/Day)
 Changes for 0.9.14:
-*05/08/17
+*05/08/23:
+   * Fixed unresolved symbols when configure --disable-regexp (Mathias)
+     src/Makefile.am
+*05/08/17:
    * Added the 'Education' submenu to fbgm (thanx Lam)
      fluxbox-generate_menu.in
 *05/08/15
diff --git a/src/Makefile.am b/src/Makefile.am
index 9e15d8b8..3ccf6879 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,11 +65,9 @@ if GNOME
 gnome_SOURCE= Gnome.hh Gnome.cc
 endif
 if REMEMBER_SRC
-REMEMBER_SOURCE= Remember.hh Remember.cc
 # For now we only want regexp if we have remember
-if REGEXP_SRC
-REGEXP_SOURCE = RegExp.hh RegExp.cc ClientPattern.hh ClientPattern.cc
-endif
+REMEMBER_SOURCE= Remember.hh Remember.cc \
+	RegExp.hh RegExp.cc ClientPattern.hh ClientPattern.cc
 endif
 if TOOLBAR_SRC
 TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \
@@ -130,7 +128,7 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
 	Resources.cc \
 	WindowCmd.hh WindowCmd.cc \
 	${newwmspec_SOURCE} ${gnome_SOURCE} \
-	${REMEMBER_SOURCE} ${REGEXP_SOURCE} ${TOOLBAR_SOURCE}
+	${REMEMBER_SOURCE} ${TOOLBAR_SOURCE}
 
 
 LDADD=FbTk/libFbTk.a defaults.$(OBJEXT)
diff --git a/src/RegExp.cc b/src/RegExp.cc
index 96f3ce47..50748c57 100644
--- a/src/RegExp.cc
+++ b/src/RegExp.cc
@@ -99,6 +99,6 @@ bool RegExp::error() const {
 #ifdef USE_REGEXP
     return m_regex == 0; 
 #else
-    return return m_str == "";
+    return m_str == "";
 #endif // USE_REGEXP
 }