diff --git a/Rakefile b/Rakefile
index 6d357f89b..50a3ec5de 100755
--- a/Rakefile
+++ b/Rakefile
@@ -124,7 +124,7 @@ def define_default_task
   # The applications themselves
   targets = $applications.clone
 
-  targets << "apps:tools"
+  targets << "apps:tools" if c?(:BUILD_TOOLS)
 
   # Build the unit tests only if requested
   targets << ($run_unit_tests ? 'tests:run_unit' : 'tests:unit') if $have_gtest
diff --git a/ac/tools.m4 b/ac/tools.m4
new file mode 100644
index 000000000..3de8cd7bd
--- /dev/null
+++ b/ac/tools.m4
@@ -0,0 +1,4 @@
+AC_ARG_WITH(tools,[AS_HELP_STRING([--with-tools],[build the tools in the src/tools sub-directory (useful mainly for development)])],
+            [BUILD_TOOLS=yes],[BUILD_TOOLS=no])
+
+AC_SUBST(BUILD_TOOLS)
diff --git a/build-config.in b/build-config.in
index 4006852c0..f7c9e4554 100644
--- a/build-config.in
+++ b/build-config.in
@@ -136,6 +136,7 @@ ZLIB_LIBS = @ZLIB_LIBS@
 USE_WXWIDGETS = @USE_WXWIDGETS@
 USE_QT = @USE_QT@
 BUILD_MKVTOOLNIX_GUI = @BUILD_MKVTOOLNIX_GUI@
+BUILD_TOOLS = @BUILD_TOOLS@
 
 TRANSLATIONS = @TRANSLATIONS@
 MANPAGES_TRANSLATIONS = @MANPAGES_TRANSLATIONS@
diff --git a/configure.in b/configure.in
index bea0f9b65..2330c8cbc 100644
--- a/configure.in
+++ b/configure.in
@@ -52,6 +52,7 @@ m4_include(ac/po4a.m4)
 m4_include(ac/translations.m4)
 m4_include(ac/manpages_translations.m4)
 m4_include(ac/guide_translations.m4)
+m4_include(ac/tools.m4)
 
 AC_OUTPUT(build-config)