3 files changed, 5 insertions, 28 deletions

diff --git a/Makefile.am b/Makefile.am
index 35e4ef83c..66c9532f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ if DOCUMENTATION
   SUBDIRS += doc
 endif
 
-SUBDIRS += contrib
+SUBDIRS += contrib data scripts
 
 EXTRA_DIST = \
  ABOUT-NLS \
diff --git a/configure.ac b/configure.ac
index b6d78c259..05e902399 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1214,7 +1214,9 @@ AC_CONFIG_FILES([
 Makefile
 bin/Makefile
 contrib/Makefile
-contrib/hellos/Makefile
+data/Makefile
+data/hellos/Makefile
+scripts/Makefile
 contrib/services/Makefile
 contrib/services/openrc/Makefile
 contrib/services/systemd/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 13fdcdd60..4683f0791 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,35 +1,10 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
-SUBDIRS = scripts hellos services
+SUBDIRS = scripts services
 
 include Makefile.inc
 
-dist_pkgdata_DATA = \
-  gns/def.tex \
-  gns/gns-bcd.html \
-  gns/gns-bcd.tex \
-  gns/gns-bcd-forbidden.html \
-  gns/gns-bcd-internal-error.html \
-  gns/gns-bcd-invalid-key.html \
-  gns/gns-bcd-not-found.html \
-  gns/gns-bcd-png.tex \
-  gns/gns-bcd-simple.html \
-  gns/gns-bcd-simple.tex \
-  fcfsd/fcfsd-index.html \
-  fcfsd/fcfsd-forbidden.html \
-  fcfsd/fcfsd-notfound.html \
-  branding/logo/gnunet-logo.png \
-  branding/logo/gnunet-logo-dark-text.svg \
-  branding/logo/gnunet-logo-dark-only-text.svg \
-  testing_hostkeys.ecc \
-  netjail/netjail_core.sh \
-  netjail/netjail_exec.sh \
-  netjail/netjail_start.sh \
-  netjail/netjail_stop.sh \
-  netjail/topo.sh \
-  testing-ng/block.sh
-
 INITD_FILES = \
   services/systemd/gnunet-user.service \
   services/systemd/sysusers-gnunet.conf \