diff --git a/configure.ac b/configure.ac
index 1f1674622764f06d7908c4564e952d2a7c09acff..1620c7ff77a6bb23a0e0eb98c56cd4000bb5c79c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_ARG_ENABLE([python], [AS_HELP_STRING([--disable-python], [Disble python bindi
 AS_IF([test "x$enable_python" != "xno"], [
        AM_PATH_PYTHON([3.3],, [:])
        AS_IF([test -n "$PYTHON"],[
-              AC_CHECK_PROGS([CYTHON], [cython])
+              AC_CHECK_PROGS([CYTHON], [cython3])
               AS_IF([test -z "$CYTHON"],[AC_MSG_WARN([Cython not found - continuing without python support])])
               AC_CHECK_PROGS([PIP], [pip3])
               AS_IF([test -z "$PIP"],[AC_MSG_WARN([pip not found - continuing without python uninstall support])])
diff --git a/src/Makefile.am b/src/Makefile.am
index 44a655a556940afdcde10a0a45dc16fa10bb1d04..806c0cb0996a3c8cd5a8df8d23f9fc09494d453c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,10 +9,11 @@ libopendht_la_LIBADD = ./argon2/libargon2.la
 
 libopendht_la_SOURCES = \
         dht.cpp \
-    	network_engine.cpp \
+        routing_table.cpp \
+        network_engine.cpp \
         utils.cpp \
         infohash.cpp \
-    	node.cpp \
+        node.cpp \
         value.cpp \
         crypto.cpp \
         securedht.cpp \
@@ -26,11 +27,12 @@ endif
 nobase_include_HEADERS = \
         ../include/opendht.h \
         ../include/opendht/dht.h \
+        ../include/opendht/routing_table.h \        
         ../include/opendht/network_engine.h \
-    	../include/opendht/scheduler.h \
+        ../include/opendht/scheduler.h \
         ../include/opendht/utils.h \
         ../include/opendht/infohash.h \
-    	../include/opendht/node.h \
+        ../include/opendht/node.h \
         ../include/opendht/value.h \
         ../include/opendht/crypto.h \
         ../include/opendht/securedht.h \