diff --git a/Scheduler/Scheduler.hh b/Scheduler/Scheduler.hh
index a3e1295db7d4d7c65480a5ef35d2d75e74c907aa..3ec8147a2d818531f1f2ceb65ed13e6bd0845c54 100644
--- a/Scheduler/Scheduler.hh
+++ b/Scheduler/Scheduler.hh
@@ -151,9 +151,7 @@ namespace senf {
                                         ///< Add timeout event
                                         /**< \param[in] timeout timeout in nanoseconds
                                              \param[in] cb callback to call after \a timeout
-                                                 milliseconds
-                                             \todo Return some kind of handle/pointer and add
-                                                 support to update or revoke a timeout */
+                                                 milliseconds */
 
         void cancelTimeout(unsigned id);
 
diff --git a/Socket/Protocols/INet/INet4Address.cc b/Socket/Protocols/INet/INet4Address.cc
index bd9bd688e93fcfb1af34024d84e37dd4a4acac29..5d503092d13ff7794ebcb5a170ecd0e278a93c8e 100644
--- a/Socket/Protocols/INet/INet4Address.cc
+++ b/Socket/Protocols/INet/INet4Address.cc
@@ -31,7 +31,7 @@
 #include <netdb.h>
 #include <sys/socket.h>
 #include <boost/lexical_cast.hpp>
-#ifdef _REENTRANT
+#ifd defined(_REENTRANT) && !defined(__GLIBC__)
 #include <boost/thread/mutex.hpp>
 #endif
 
diff --git a/debian/control b/debian/control
index ab91aa9cd7e54156d629943520aae42d436610a7..3f753f877c6e6759758d45cc11f6fd384d006307 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: extra
 Maintainer: Stefan Bund <senf-dev@lists.berlios.de>
 Build-Depends: debhelper (>= 5), scons, binutils-dev, libboost-dev, 
 	libboost-test-dev, libboost-date-time-dev, libboost-regex-dev, 
-	libboost-thread-dev, doxygen, dia, tidy, xsltproc, graphviz
+	doxygen, dia, tidy, xsltproc, graphviz, perl-base
 Standards-Version: 3.7.2
 Section: libs