diff --git a/ChangeLog b/ChangeLog
index 13b64b0d1e..72aff04bd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-26	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* configure.ac: Don't build tools/schedsim by default.
+	Add --enable-schedsim (Default: disabled).
+
 2010-12-17	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	Add RTEMS Scheduler Simulator.
diff --git a/configure.ac b/configure.ac
index 7e1971ed10..f0f9c7d7ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,13 @@ AC_ARG_ENABLE([docs],
 
 RTEMS_BUILD_CONFIG_SUBDIRS([tools/build])
 RTEMS_BUILD_CONFIG_SUBDIRS([tools/cpu])
+
+# FIXME: tools/schedsim has a lot of problems, don't build by default
+AC_ARG_ENABLE([schedsim],
+  [AS_HELP_STRING([--enable-schedsim],[enable building tools/schedsim (default::disabled)])])
+AS_IF([test "$enable_schedsim" = yes],[
 RTEMS_BUILD_CONFIG_SUBDIRS([tools/schedsim])
+])
 
 case $enable_tests in
 yes | samples )