diff --git a/Makefile.inc.in b/Makefile.inc.in
index d38d853c1..d1e1da486 100644
--- a/Makefile.inc.in
+++ b/Makefile.inc.in
@@ -65,7 +65,7 @@ CXXFLAGS_WX        = @WX_CXXFLAGS@
 CPPFLAGS_WX        = @WX_CPPFLAGS@
 LIBS_WX            = @WX_LIBS@ -lz
 
-CPPFLAGS_BOOST     = @BOOST_CPPFLAGS@ -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION
+CPPFLAGS_BOOST     = @BOOST_CPPFLAGS@
 LIBS_BOOST         = @BOOST_LDFLAGS@ @BOOST_FILESYSTEM_LIB@ @BOOST_LOCALE_LIB@ @BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_CHRONO_LIB@
 
 CFLAGS_FFMS2       = @FFMS2_CFLAGS@
diff --git a/configure.ac b/configure.ac
index b7475f2a6..230e2b498 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,6 +217,11 @@ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
 AC_CHECK_HEADERS([boost/spirit/home/phoenix/version.hpp])
 CPPFLAGS=$cppflags_bak
 
+AC_DEFINE(BOOST_SYSTEM_NO_DEPRECATED, 1,
+          [Disable deprecated parts of boost.system])
+AC_DEFINE(BOOST_MULTI_INDEX_DISABLE_SERIALIZATION, 1,
+          [Disable boost.serialization support for boost.multi_index])
+
 PKG_CHECK_MODULES(ICU_UC, icu-uc >= icu_required_version)
 PKG_CHECK_MODULES(ICU_I18N, icu-i18n >= icu_required_version)