diff --git a/ChangeLog b/ChangeLog
index 9af45a2..0e1aeb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
   version UNRELEASED:
 	* Added Estonian translation (thanks Anari Jalakas).
 	* Use AM_MAINTAINER_MODE([enable]) to prevent timestamp skew issue
+	* Disable search and replace history by default.
 
 2012-01-09
 
diff --git a/SHA1SUMS b/SHA1SUMS
index 1a4fca4..be45360 100644
--- a/SHA1SUMS
+++ b/SHA1SUMS
@@ -2,15 +2,15 @@
 Hash: SHA1,SHA512
 
 634071380936e4893b0e8cacdfcd344638406575    171 AUTHORS
-f884c6601c671d4601483329f1a4441780bc9ba3  10196 ChangeLog
+bbe30a2fead79e639cf944411863b575c01b9001  10246 ChangeLog
 0beb31ee37259edeb621d345db933f2c827b2a21     22 Makefile.am
 19e4d83532a090725397743df31fc6b53aec945d  23259 Makefile.in
 04dc937708d52f3b9b6f9a096898c5e23fb80ace   2071 README
 eadc283cf6042d52f9ed634edad31437175de3df  68156 aclocal.m4
 ebde5ed5590e81b0426dc0ebc4c0b124e987a288   6879 compile
-7c5c2a0e918489ebb5817d0035e087a4ddc6ca3d   2709 config.h.in
-6a57120f39951cec20ad028b62bae710ae555543 241122 configure
-930459bccb1f13b1ff693a74943c553ce3654035   2189 configure.ac
+746591d22592543428246555f12fb9be23dbb1ee   2708 config.h.in
+70e3fba3a51ccb213713d9edd1de8eb4a1734e59 241095 configure
+e4d2fd69b3c98f76ed219b2a9c89f4a070b9a836   2187 configure.ac
 cbd191104fbb3eda18bc12e1caa9e60db401a008    264 data/Makefile.am
 5a2daa492c8aee000a3482e3036f9d73c58c1780  20158 data/Makefile.in
 d5f3d29e0f768e7a48a9ab7bb7903aa123a72280     99 data/icons/128x128/Makefile.am
@@ -141,7 +141,7 @@ f6b21adcfc00151deba02a4339ea5883a7b8f411   2486 src/hlight.c
 828e51d43aaa64cbaa492baf761d053bba6b02dd   1019 src/hlight.h
 65d41180e4ad4ffc8e15910f64cd1c659bc30aa2   6774 src/indent.c
 bb2a52d5a1969da5a312b91bbba32d0489a48871   1334 src/indent.h
-fee3226a54e807797560be5ee61cb8cd81a848c8   3699 src/l3afpad.h
+ff7c1d2ca41ece6cf4115bc1c527d13a7d11e20c   3699 src/l3afpad.h
 5c7f1b15d14250641334d67af6768c6b66ae9450   7420 src/linenum.c
 6f63e2c07f844c7ba97c77d3e7234d30560a09f0    983 src/linenum.h
 5451aa9d991c54e57f2a23492830050320321f5a   8319 src/main.c
@@ -161,18 +161,18 @@ bf524e4de2a68901495a91d181cf3573edd3027b   2532 src/window.c
 75d1c79bfdd24b7ae5450ead4aef3ab43267e85f   1068 src/window.h
 -----BEGIN PGP SIGNATURE-----
 
-iEYEARECAAYFAk852icACgkQdEpXpumNYVkFHgCfSC0CmIN06642VWpz2B86d/P2
-9/UAnjNy8bvoy2wLCTWEgT0Jz0r7Jp+giQIcBAEBCgAGBQJPOdonAAoJELc3H0m+
-i6gZQ7YP/38AWU6GdouM76VJoVd9vjzrz+spS+eL7jAJAhSjB26jUiFa+wWZY4WX
-qgMDoB1ECC+o5YA0VzTWdYqfCn/FSs88L969dUAWs0tA/BVLKT01dpTkKGXLThn2
-A6zJBH6n9yhHuJg+kw/eCM1t3n2lZj6FX1CKSTsU+GBFc+DQCiXuB5RF5Mj6Gs2E
-NQva414SgI4K9YHnM9gINY/pyQeJa/OMsebHER5CcYSRAn2AhQE884VkBDETsMj+
-FBPAkm98bLHu8kmFfMaNVoduzc+NbIuZlbpv4UuSFm41c/Cb19dKOksP9j2+pUs+
-GEh5pChjXSbTUrk/oTI+K5ot20pZyo5zKT24bKqGK4m22NCRn/OJLwH/QdZW2bzv
-PVkZUDN20iizWzJE9+wCuwaPE3osyHcfeOJ0khselkVouc2/3u/EBiQaRqzQyk/S
-lVrKq2dxDfrLal6s4Er6bGSbGK8OGd56psm9p8Wf0CPOIxCROsEQyeo0cCgN22LY
-jUvcctlcx66/CCsMHDupnpH9BsMpn6IVO/NVlLeLQO1kzL+eYB+FDJSDUaGZphA3
-8pT7qBUYVrJNLuKj/n6ugAb0h/JPi5dXgKn+mQbpWeaBmGsInTaMmXgRWXwx+WMM
-IqeIF11q//aqKhdBj7Hz0vLAYNCA/PBXiFqYNj6QYEt0KJ5uMobb
-=f6NQ
+iEYEARECAAYFAk9B540ACgkQdEpXpumNYVkNAwCgkRo2+sD4CjNbWB05ISlxQfBS
+UoIAoIMNsbGY6b+POUEBZsAogpTVpxM+iQIcBAEBCgAGBQJPQeeNAAoJELc3H0m+
+i6gZ0eUP/iX58BaJj+pnq0B8HIw1kn5FiT3am40ysZ9Y2gl0KF67d8ooGwP3GQjO
+4XEm9JYLhPQL0W18D8NJQxpgSaU8NI31v8dL9Ffp6p13soT6kyxCqPkeucu7okL+
+F/JGZEIR/DVCP4vWNJ3T5mhxUorKu/GLnlwQn+JKKey0DQDvGjO9W72c37kQrNdl
+voo7H9dDy6nkzhsPItW93KFwrIizfQDZWLisSBVmQL8ZJY768chv9XZs6NO0pGHv
+nZpSKK2zntuLjiAQ8Kb0wFIeoYgasr7sjtMtGahpeX8KKK9PqpXdLo++vIHAgozU
+DV3PY9nTCn7iKBsFd6zCbXgo9J/9dOcAiMi66JFgki5II8hJqmbmwy4Nu6uDhSc5
+g970R0iIuf/Tkjkm1s8P08vQZIos0Y6cSHmRxnZpbKbnGo12JHuoxEu0BTM85bip
+QMcQI7EVclV9tJPDDRHgtuhcTEihuIKShPFYxZ8UJiEIB44PN9D15CzCO5kiSahB
+fv5QSk4YnC0i01hYKsXz1KOln3q2OD4oW4I5HVfDhkehGNBB5QSK3rH6DQB3Qens
+/VHntd62kuItgIDC0+Nm/d0rEZ/0TUwmpul9BS0do30qokjz5oOkb+2sUk5v2dH4
+DNy8ZtC44urqxh3iUUtMv4th9rYQ1r2h3tkkfrzT9z/zcaE4U8yo
+=yTvV
 -----END PGP SIGNATURE-----
diff --git a/config.h.in b/config.h.in
index b0b9056..a782732 100644
--- a/config.h.in
+++ b/config.h.in
@@ -84,7 +84,7 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 0 if you disable search history. */
+/* Define to 1 if you enable search history. */
 #undef SEARCH_HISTORY
 
 /* Define to 1 if you have the ANSI C header files. */
diff --git a/configure b/configure
index 37287ae..df19f54 100755
--- a/configure
+++ b/configure
@@ -744,11 +744,11 @@ enable_largefile
 enable_dependency_tracking
 enable_nls
 enable_print
-enable_search_history
 enable_statistics
 enable_xinput2
 enable_emacs
 enable_gtkgrid
+enable_search_history
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1387,12 +1387,11 @@ Optional Features:
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-nls           do not use Native Language Support
   --disable-print         force to disable print feature
-  --disable-search-history
-                          force to disable search history
   --disable-statistics    force to disable statistics
   --disable-xinput2       force to disable Xinput2
   --enable-emacs          implement Emacs key theme (experimental)
   --enable-gtkgrid        Enable GtkGrid
+  --enable-search-history force to enable search history
 
 Some influential environment variables:
   CC          C compiler command
@@ -5485,17 +5484,6 @@ $as_echo "#define ENABLE_PRINT 0" >>confdefs.h
 
 	fi
 
-# Check whether --enable-search-history was given.
-if test "${enable_search_history+set}" = set; then :
-  enableval=$enable_search_history;
-fi
-
-	if test "$enable_search_history" = "no"; then
-
-$as_echo "#define SEARCH_HISTORY 0" >>confdefs.h
-
-	fi
-
 # Check whether --enable-statistics was given.
 if test "${enable_statistics+set}" = set; then :
   enableval=$enable_statistics;
@@ -5540,6 +5528,17 @@ $as_echo "#define USE_GTK_GRID 1" >>confdefs.h
 
 	fi
 
+# Check whether --enable-search-history was given.
+if test "${enable_search_history+set}" = set; then :
+  enableval=$enable_search_history;
+fi
+
+	if test "$enable_search_history" = "yes"; then
+
+$as_echo "#define SEARCH_HISTORY 1" >>confdefs.h
+
+	fi
+
 GETTEXT_PACKAGE="$PACKAGE"
 
 ac_ext=c
diff --git a/configure.ac b/configure.ac
index 6731604..0fcfb7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,6 @@ AC_ARG_ENABLE(print,
 		AC_DEFINE(ENABLE_PRINT, 0, [Define to 0 if you disable print.])
 	fi
 
-AC_ARG_ENABLE(search-history,
-	AC_HELP_STRING([--disable-search-history], [force to disable search history]))
-	if test "$enable_search_history" = "no"; then
-		AC_DEFINE(SEARCH_HISTORY, 0, [Define to 0 if you disable search history.])
-	fi
-
 AC_ARG_ENABLE(statistics,
 	AC_HELP_STRING([--disable-statistics], [force to disable statistics]))
 	if test "$enable_statistics" = "no"; then
@@ -48,6 +42,12 @@ AC_ARG_ENABLE(gtkgrid,
 		AC_DEFINE(USE_GTK_GRID, 1, [Define to 1 if you enable GtkGrid.])
 	fi
 
+AC_ARG_ENABLE(search-history,
+	AC_HELP_STRING([--enable-search-history], [force to enable search history]))
+	if test "$enable_search_history" = "yes"; then
+		AC_DEFINE(SEARCH_HISTORY, 1, [Define to 1 if you enable search history.])
+	fi
+
 GETTEXT_PACKAGE="$PACKAGE"
 AC_SUBST(GETTEXT_PACKAGE)
 AM_GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
diff --git a/src/l3afpad.h b/src/l3afpad.h
index 2eceae3..d0ce6d3 100644
--- a/src/l3afpad.h
+++ b/src/l3afpad.h
@@ -32,7 +32,7 @@
 #endif
 
 #ifndef SEARCH_HISTORY
-#define SEARCH_HISTORY 1
+#define SEARCH_HISTORY 0
 #endif
 
 #ifndef ENABLE_STATISTICS