diff --git a/.distignore b/.distignore
index 7be8da9e6..979ecd28d 100644
--- a/.distignore
+++ b/.distignore
@@ -1,10 +1,12 @@
-build
-thirdparty
+build/
+thirdparty/
+
+.git/
 
-.git
 .gitmodules
 .gitignore
 .dockerignore
+.distignore
 
 .DS_Store
 *~
diff --git a/.dockerignore b/.dockerignore
index 552bc9355..d77bff3d8 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,3 +2,4 @@
 !build/release/packaging/rpm/*
 !thirdparty/criterion/
 !thirdparty/libiec61850/
+thirdparty/*/build/
diff --git a/Makefile b/Makefile
index 8881b77ea..b04a283a1 100644
--- a/Makefile
+++ b/Makefile
@@ -169,4 +169,4 @@ clean:   $(addprefix clean-,  $(filter-out thirdparty doc clients,$(MODULES)))
 
 include $(wildcard $(SRCDIR)/make/Makefile.*)
 include $(wildcard $(BUILDDIR)/**/*.d)
-include $(patsubst %,$(SRCDIR)/%/Makefile.inc,$(MODULES))
+-include $(patsubst %,$(SRCDIR)/%/Makefile.inc,$(MODULES))
diff --git a/packaging/rpm/villas-node.spec b/packaging/rpm/villas-node.spec
index 1bddec475..c96c2dce4 100644
--- a/packaging/rpm/villas-node.spec
+++ b/packaging/rpm/villas-node.spec
@@ -14,8 +14,8 @@ BuildRequires: gcc pkgconfig make
 
 Requires:      iproute kernel-modules-extra module-init-tools
 
-BuildRequires: openssl-devel libconfig-devel libnl3-devel libcurl-devel jansson-devel libxil-devel libwebsockets-devel zeromq-devel nanomsg-devel libiec61850-devel
-Requires:      openssl       libconfig       libnl3       libcurl       jansson       libxil       libwebsockets       zeromq       nanomsg       libiec61850
+BuildRequires: openssl-devel libconfig-devel libnl3-devel libcurl-devel jansson-devel libwebsockets-devel zeromq-devel nanomsg-devel libiec61850-devel
+Requires:      openssl       libconfig       libnl3       libcurl       jansson       libwebsockets       zeromq       nanomsg       libiec61850
 
 %description