diff --git a/configure.ac b/configure.ac
index ff5de68e8..1380dde4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,6 +215,20 @@ AM_CONDITIONAL(HAVE_ZEROCONF, test x$with_zeroconf != xno)
 AM_CONDITIONAL(HAVE_AVAHI, test x$with_zeroconf = xavahi)
 AM_CONDITIONAL(HAVE_BONJOUR, test x$with_zeroconf = xbonjour)
 
+AC_ARG_ENABLE(sqlite,
+	AS_HELP_STRING([--enable-sqlite],
+		[enable support for the SQLite database (default: disable)]),
+	[enable_sqlite=$enableval],
+	[enable_sqlite=no])
+
+if test x$enable_sqlite = xyes; then
+	PKG_CHECK_MODULES([SQLITE], [sqlite3],,
+		[AC_MSG_ERROR(sqlite not found)])
+	AC_DEFINE([ENABLE_SQLITE], 1, [Define to enable sqlite database support])
+fi
+
+AM_CONDITIONAL(ENABLE_SQLITE, test x$enable_sqlite = xyes)
+
 
 dnl
 dnl input plugins
diff --git a/src/Makefile.am b/src/Makefile.am
index 36f336ddc..d92b40ff1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@ bin_PROGRAMS = mpd
 
 mpd_CFLAGS = $(MPD_CFLAGS)
 mpd_CPPFLAGS = \
+	$(SQLITE_CFLAGS) \
 	$(CURL_CFLAGS) \
 	$(AO_CFLAGS) $(ALSA_CFLAGS) \
 	$(SHOUT_CFLAGS) \
@@ -14,6 +15,7 @@ mpd_CPPFLAGS = \
 	$(FFMPEG_CFLAGS) \
 	$(GLIB_CFLAGS)
 mpd_LDADD = $(MPD_LIBS) \
+	$(SQLITE_LIBS) \
 	$(CURL_LIBS) \
 	$(AO_LIBS) $(ALSA_LIBS) \
 	$(SHOUT_LIBS) \