diff --git a/gnunet-0.10.1_gnurl.patch b/gnunet-0.10.1_gnurl.patch
deleted file mode 100644
index 055a7b9..0000000
--- a/gnunet-0.10.1_gnurl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN gnunet-0.11.4.orig/configure.ac gnunet-0.11.4/configure.ac
---- gnunet-0.11.4.orig/configure.ac	2019-05-12 13:54:45.000000000 +0300
-+++ gnunet-0.11.4/configure.ac	2019-05-15 19:58:27.798285711 +0300
-@@ -762,7 +762,7 @@
- fi
- 
- # libgnurl
--LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0)
-+$gnurl=yes
- 
- SAVE_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$LIBGNURL_CPPFLAGS $LIBCURL_CPPFLAGS $CPPFLAGS"
diff --git a/gnunet-0.11.4.tar.gz b/gnunet-0.11.4.tar.gz
deleted file mode 100644
index 7a3bba1..0000000
--- a/gnunet-0.11.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7afeb638bd8b5a33c6b8dab24b90c5d7467439adc79794ff33218e9180f8b01b
-size 7597015
diff --git a/gnunet-0.21.1.tar.gz b/gnunet-0.21.1.tar.gz
new file mode 100644
index 0000000..51a2a15
--- /dev/null
+++ b/gnunet-0.21.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93e68b3eaca7087273e3d7685fe6ae38b2e8055e4c9e700d360dd4055249785c
+size 8225355
diff --git a/gnunet-0.21.1.tar.gz.sig b/gnunet-0.21.1.tar.gz.sig
new file mode 100644
index 0000000..dc458e4
Binary files /dev/null and b/gnunet-0.21.1.tar.gz.sig differ
diff --git a/gnunet.changes b/gnunet.changes
index 4401320..4cc5398 100644
--- a/gnunet.changes
+++ b/gnunet.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Mar 17 13:23:55 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- GNUnet 0.21.1 - completely reworked package
+
 -------------------------------------------------------------------
 Thu May 16 23:04:13 UTC 2019 - Alexei Podvalsky <avvissu@yandex.by>
 
diff --git a/gnunet.keyring b/gnunet.keyring
new file mode 100644
index 0000000..ab8bd66
--- /dev/null
+++ b/gnunet.keyring
@@ -0,0 +1,172 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=PjLK
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gnunet.service.in b/gnunet.service.in
deleted file mode 100644
index 8192faf..0000000
--- a/gnunet.service.in
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=GNUnet
-Description=Security focused Peer-to-Peer Framework
-Description=Configuration files: /etc/gnunet.conf /usr/share/gnunet/config.d
-Description=Log files: /var/log/gnunet/gnunet.log
-After=syslog.target remote-fs.target network.target
-Wants=time-sync.target ypbind.service sendmail.service
-Before=time-sync.target ypbind.service sendmail.service
-
-[Service]
-Type=forking
-ExecStart=@LIBDIR@/gnunet/libexec/gnunet-service-arm -l /var/log/gnunet/gnunet.log -d
-TimeoutStartSec=5s
-WorkingDirectory=/var/run/gnunet
-User=@USER@
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gnunet.spec b/gnunet.spec
index ab01020..a503d44 100644
--- a/gnunet.spec
+++ b/gnunet.spec
@@ -1,6 +1,7 @@
 #
 # spec file for package gnunet
 #
+# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
 # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
 #
@@ -17,72 +18,117 @@
 #
 
 
-%define gnurl gnurl-7.64.1
-%define _USER_ gnunet
-%define _GROUP_ gnunet
-%define _OTHERGROUP_ gnunetdns
 Name:           gnunet
-Version:        0.11.4
+Version:        0.21.1
 Release:        0
 Summary:        Security focused Peer-to-Peer Framework
-License:        GPL-3.0-only
+License:        AGPL-3.0-or-later
 Group:          Productivity/Networking/File-Sharing
-URL:            http://gnunet.org
-Source0:        ftp://ftp.gnu.org/gnu/gnunet/%{name}-%{version}.tar.gz
-Source1:        ftp://ftp.gnu.org/gnu/gnunet/%{gnurl}.tar.gz
-Source2:        gnunet.service.in
-Source3:        gnunet.sysusers.in
-Source4:        gnunet.tmpfile.in
-Patch0:         gnunet-0.10.1_gnurl.patch
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  gcc
-BuildRequires:  glibc-devel
-BuildRequires:  glpk-devel >= 4.45
-BuildRequires:  guile-devel >= 2.0
-BuildRequires:  libadns-devel
-BuildRequires:  libesmtp-devel
-BuildRequires:  libgcrypt-devel >= 1.6
-BuildRequires:  libmysqlclient-devel >= 5.1
-BuildRequires:  libtool
+URL:            https://www.gnunet.org/
+Source0:        http://ftpmirror.gnu.org/gnunet/%{name}-%{version}.tar.gz
+Source1:        http://ftpmirror.gnu.org/gnunet/%{name}-%{version}.tar.gz.sig
+# https://gnunet.org/~schanzen/3D11063C10F98D14BD24D1470B0998EF86F59B6A
+Source2:        %{name}.keyring
+BuildRequires:  libtool >= 2.2
 BuildRequires:  libunistring-devel
-BuildRequires:  make
-BuildRequires:  pkgconfig
-BuildRequires:  postgresql-devel >= 8.3
+BuildRequires:  pkgconfig >= 0.9.0
+BuildRequires:  python3-Sphinx
+BuildRequires:  sysuser-tools
+BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gnutls) >= 3.2.12
-BuildRequires:  pkgconfig(libcares)
-BuildRequires:  pkgconfig(libextractor) >= 0.6.1
+BuildRequires:  pkgconfig(jansson)
+BuildRequires:  pkgconfig(libcurl) >= 7.34.0
+BuildRequires:  pkgconfig(libextractor)
+BuildRequires:  pkgconfig(libgcrypt) >= 1.6.0
 BuildRequires:  pkgconfig(libidn2)
-BuildRequires:  pkgconfig(libmicrohttpd) >= 0.9.33
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(sqlite3) >= 3.8
-Recommends:     %{name}-lang
-Recommends:     %{name}-plugins
-Recommends:     %{name}-storage-backend
-Provides:       gnunetd = %{version}
-Provides:       GNUnet = %{version}
-Provides:       GNUnetd = %{version}
-%{?systemd_requires}
-# SECTION Recommend
-BuildRequires:  pkgconfig(libpulse) >= 2.0
-BuildRequires:  pkgconfig(ogg) >= 1.3.0
-BuildRequires:  pkgconfig(openssl) >= 1.0
-BuildRequires:  pkgconfig(opus) >= 1.0.1
-# /SECTION
+BuildRequires:  pkgconfig(libpq)
+BuildRequires:  pkgconfig(libmicrohttpd) >= 0.9.63
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libsodium) >= 1.0.18
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(zbar)
+BuildRequires:  pkgconfig(zlib)
+# openssl for gnunet-gns-proxy-setup-ca
+Requires:       %{_bindir}/openssl
+# certutil for gnunet-gns-proxy-setup-ca
+Requires:       mozilla-nss-tools
+Recommends:     miniupnpc
+%sysusers_requires
 
 %description
 GNUnet is peer-to-peer framework focusing on security. The first and primary
 application for GNUnet is anonymous file-sharing. GNUnet is currently developed
 by a worldwide group of independent free software developers.
 
-GNUnet is a part of the GNU project (http://www.gnu.org/).
+GNUnet is a part of the GNU project (https://www.gnu.org/).
+
+# A list of all shared libraries shipped in this package
+# Will be run through two generator macros: once in -devel
+# and again to generate individual packages
+%define gnunet_libs \
+%gnunet_libpackage -l gnunetarm -s 2\
+%gnunet_libpackage -l gnunetblockgroup -s 0\
+%gnunet_libpackage -l gnunetblock -s 0\
+%gnunet_libpackage -l gnunetcadet -s 7\
+%gnunet_libpackage -l gnunetconsensus -s 0\
+%gnunet_libpackage -l gnunetcore -s 0\
+%gnunet_libpackage -l gnunetcoretesting -s 0\
+%gnunet_libpackage -l gnunetcurl -s 0\
+%gnunet_libpackage -l gnunetdatacache -s 0\
+%gnunet_libpackage -l gnunetdatastore -s 1\
+%gnunet_libpackage -l gnunetdht -s 4\
+%gnunet_libpackage -l gnunetdid -s 0\
+%gnunet_libpackage -l gnunetdns -s 0\
+%gnunet_libpackage -l gnunetfs -s 2\
+%gnunet_libpackage -l gnunetgnsrecordjson -s 0\
+%gnunet_libpackage -l gnunetgnsrecord -s 0\
+%gnunet_libpackage -l gnunetgns -s 0\
+%gnunet_libpackage -l gnunethello -s 0\
+%gnunet_libpackage -l gnunetidentity -s 1\
+%gnunet_libpackage -l gnunetjson -s 0\
+%gnunet_libpackage -l gnunetmessenger -s 0\
+%gnunet_libpackage -l gnunetmessengertesting -s 0\
+%gnunet_libpackage -l gnunetnamecache -s 0\
+%gnunet_libpackage -l gnunetnamestore -s 0\
+%gnunet_libpackage -l gnunetnatauto -s 0\
+%gnunet_libpackage -l gnunetnatnew -s 2\
+%gnunet_libpackage -l gnunetnse -s 0\
+%gnunet_libpackage -l gnunetpeerstore -s 0\
+%gnunet_libpackage -l gnunetpq -s 5\
+%gnunet_libpackage -l gnunetreclaim -s 0\
+%gnunet_libpackage -l gnunetregexblock -s 1\
+%gnunet_libpackage -l gnunetregex -s 3\
+%gnunet_libpackage -l gnunetrest -s 0\
+%gnunet_libpackage -l gnunetrevocation -s 0\
+%gnunet_libpackage -l gnunetscalarproduct -s 0\
+%gnunet_libpackage -l gnunetsecretsharing -s 0\
+%gnunet_libpackage -l gnunetseti -s 0\
+%gnunet_libpackage -l gnunetset -s 0\
+%gnunet_libpackage -l gnunetsetu -s 0\
+%gnunet_libpackage -l gnunetsq -s 0\
+%gnunet_libpackage -l gnunetstatistics -s 2\
+%gnunet_libpackage -l gnunettesting -s 1\
+%gnunet_libpackage -l gnunettransportapplication -s 0\
+%gnunet_libpackage -l gnunettransportcommunicator -s 0\
+%gnunet_libpackage -l gnunettransportcore -s 0\
+%gnunet_libpackage -l gnunettransportmonitor -s 0\
+%gnunet_libpackage -l gnunettransporttesting2 -s 0\
+%gnunet_libpackage -l gnunetutil -s 16\
+%gnunet_libpackage -l gnunetvpn -s 0\
+%gnunet_libpackage -l nss_gns4 -s 2\
+%gnunet_libpackage -l nss_gns6 -s 2\
+%gnunet_libpackage -l nss_gns -s 2\
+%{nil}
+# generator macro for -devel
+%define gnunet_libpackage(l:s:) Requires: lib%{-l*}%{-s*} = %{version}
 
 %package        devel
 Summary:        Security focused Peer-to-Peer Framework
 Group:          Development/Libraries/C and C++
-Requires:       lib%{name} = %{version}
-Requires:       libgcrypt-devel >= 1.6
-Requires:       pkgconfig(gnutls) >= 3.2.12
+Requires:       pkgconfig(libextractor)
+Requires:       pkgconfig(libgcrypt)
+Requires:       pkgconfig(libsodium)
+%{gnunet_libs}
 
 %description    devel
 GNUnet is peer-to-peer framework focusing on security. The first and primary
@@ -92,341 +138,77 @@ by a worldwide group of independent free software developers.
 This package contains header files and libraries needed to develop
 application that use %{name}.
 
-%package -n     lib%{name}
-Summary:        GNUnet libraries
-Group:          System/Libraries
-
-%description -n lib%{name}
-GNUnet is peer-to-peer framework focusing on security. The first and primary
-application for GNUnet is anonymous file-sharing. GNUnet is currently developed
-by a worldwide group of independent free software developers.
-
-This package contains lib%{name} shared library.
-
-%package        plugins
-Summary:        GNUnet plugins
-Group:          Productivity/Networking/File-Sharing
-Requires:       %{name} = %{version}
-
-%description    plugins
-GNUnet is peer-to-peer framework focusing on security. The first and primary
-application for GNUnet is anonymous file-sharing. GNUnet is currently developed
-by a worldwide group of independent free software developers.
-
-This package contains plugins for GNUnet services.
-
-%package        mysql
-Summary:        MySQL Storage Backend for %{name}
-Group:          Productivity/Networking/Other
-Requires:       %{name} = %{version}
-Provides:       %{name}-storage-backend = %{version}
-
-%description    mysql
-GNUnet is peer-to-peer framework focusing on security. The first and primary
-application for GNUnet is anonymous file-sharing. GNUnet is currently developed
-by a worldwide group of independent free software developers.
-
-%package        postgresql
-Summary:        PostgreSQL Storage Backend for %{name}
-Group:          Productivity/Networking/Other
-Requires:       %{name} = %{version}
-Provides:       %{name}-storage-backend = %{version}
-
-%description    postgresql
-GNUnet is peer-to-peer framework focusing on security. The first and primary
-application for GNUnet is anonymous file-sharing. GNUnet is currently developed
-by a worldwide group of independent free software developers.
-
-%package        sqlite
-Summary:        SQLite Storage Backend for %{name}
-Group:          Productivity/Networking/Other
-Requires:       %{name} = %{version}
-Provides:       %{name}-storage-backend = %{version}
-
-%description    sqlite
-GNUnet is peer-to-peer framework focusing on security. The first and primary
-application for GNUnet is anonymous file-sharing. GNUnet is currently developed
-by a worldwide group of independent free software developers.
-
 %lang_package
 
-%prep
-%setup -q -b1
-%patch0 -p1
+# generator macro for individual packages
+%define gnunet_libpackage(l:s:) %package -n lib%{-l*}%{-s*}\
+Summary: GNUnet library lib%{-l*} \
+%description -n lib%{-l*}%{-s*} \
+This package contains the lib%{-l*} library for GNUnet. \
+%files -n lib%{-l*}%{-s*} \
+%%license COPYING \
+%{_libdir}/lib%{-l*}.so.%{-s*}* \
+%ldconfig_scriptlets -n lib%{-l*}%{-s*} \
+%{nil}
+%{gnunet_libs}
 
-for _file in %{SOURCE2} %{SOURCE3} %{SOURCE4}; do
-  sed -e 's/@USER@/%{_USER_}/' \
-      -e 's/@GROUP@/%{_GROUP_}/' \
-      -e 's/@OTHERGROUP@/%{_OTHERGROUP_}/' \
-      -e 's|@LIBDIR@|%{_libdir}|' \
-      < $_file > ${_file##*/}
-done
+%prep
+%autosetup -p1
 
 %build
-# Build gnurl
-pushd %{_builddir}/%{gnurl}
-autoreconf -fiv
 %configure \
-    --without-ssl \
-    --without-libpsl \
-    --without-librtmp \
-    --without-libmetalink \
-    --disable-ftp \
-    --disable-file \
-    --disable-ldap \
-    --disable-rtsp \
-    --disable-dict \
-    --disable-telnet \
-    --disable-dict \
-    --disable-telnet \
-    --disable-tftp \
-    --disable-pop3 \
-    --disable-imap \
-    --disable-smb \
-    --disable-smtp \
-    --disable-gopher \
-    --disable-ntlm-wb \
-    --enable-hidden-symbols \
-    --enable-threaded-resolver \
-    --enable-shared=no \
-    --with-random=/dev/urandom \
-    --with-ca-bundle=%{_sysconfdir}/ssl/certs/ca-certificates.crt
-
-make %{?_smp_mflags}
-popd
-# Build gnunet
-export CPPFLAGS="-I%{_builddir}/%{gnurl}/include"
-export LIBS="-L%{_builddir}/%{gnurl}/lib/.libs/ -lgnurl"
-autoreconf -fiv
-%configure \
-    --with-gnunetdns=%{grpdns}
-
-make %{?_smp_mflags} V=1 \
-    pkgcfgdir="%{_sysconfdir}/%{name}"
+	--libexecdir=%{_prefix}/lib/gnunet/libexec/ \
+	%{nil}
+%make_build
+%sysusers_generate_pre contrib/services/systemd/sysusers-gnunet.conf gnunet system-user-gnunet.conf
 
 %install
-make DESTDIR=%{buildroot} install \
-    pkgcfgdir="%{_sysconfdir}/%{name}"
-
-# install systemd files
-install -d %{buildroot}%{_sbindir}
-ln -s %{_sbindir}/service  %{buildroot}%{_sbindir}/rc%{name}
-install -Dm 0644 %{name}.service.in %{buildroot}%{_unitdir}/%{name}.service
-install -Dm 0644 %{name}.tmpfile.in %{buildroot}%{_tmpfilesdir}/%{name}.conf
-install -Dm 0644 %{name}.sysusers.in %{buildroot}%{_sysusersdir}/%{name}.conf
-
-# use a symbolic link instead of patch
-ln -s %{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config.d
-
-# set a default configuration file
-sed -re 's/^ +?# +?(DEFAULTCONFIG)/\1/' \
-    -i $(grep -rl 'DEFAULTCONFIG\ \?=' %{buildroot})
-
-# create a default configuration
-cat<<EOF > "%{buildroot}%{_sysconfdir}/%{name}.conf"
-[path]
-GNUNET_HOME = %{_localstatedir}/lib/%{name}
-GNUNET_DATA_HOME = %{_localstatedir}/lib/%{name}/data/
-#DEFAULTCONFIG = %{_sysconfdir}/%{name}.conf
-[arm]
-SYSTEM_ONLY = YES
-USER_ONLY = NO
-EOF
-
-# get rid of static libraries
+%make_install
 find %{buildroot} -type f -name "*.la" -delete -print
+# license files installed via file list
+rm -rf %{buildroot}%{_datadir}/doc/gnunet
+# not needed
+rm -rf %{buildroot}%{_datadir}/gnunet/services/openrc
 
-rm -rf %{buildroot}%{_datadir}/doc/%{name}
+install -D -m 644 contrib/services/systemd/sysusers-gnunet.conf	%{buildroot}/%{_sysusersdir}/system-user-gnunet.conf
+install -D -m 644 contrib/services/systemd/gnunet.service	%{buildroot}/%{_unitdir}/gnunet.service
 
+%suse_update_desktop_file gnunet-uri
 %find_lang %{name}
 
-%pre
-%service_add_pre %{name}.service
+%pre -f gnunet.pre
+%service_add_pre gnunet.service
 
 %post
-%service_add_post %{name}.service
-%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
-%sysusers_create %{_sysusersdir}/%{name}.conf
-%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
+%service_add_post gnunet.service
 
 %preun
-%service_del_preun %{name}.service
+%service_del_preun gnunet.service
 
 %postun
-%service_del_postun %{name}.service
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
-
-%post -n lib%{name} -p /sbin/ldconfig
-%postun -n lib%{name} -p /sbin/ldconfig
+%service_del_postun gnunet.service
 
 %files
 %license COPYING
-%doc AUTHORS ChangeLog README
-%{_bindir}/%{name}-arm
-%{_bindir}/%{name}-ats
-%{_bindir}/%{name}-auto-share
-%{_bindir}/%{name}-bcd
-%{_bindir}/%{name}-bugreport
-%{_bindir}/%{name}-cadet
-%{_bindir}/%{name}-config
-%{_bindir}/%{name}-consensus-profiler
-%{_bindir}/%{name}-conversation
-%{_bindir}/%{name}-conversation-test
-%{_bindir}/%{name}-core
-%{_bindir}/%{name}-datastore
-%{_bindir}/%{name}-dht-get
-%{_bindir}/%{name}-dht-monitor
-%{_bindir}/%{name}-dht-put
-%{_bindir}/%{name}-directory
-%{_bindir}/%{name}-download
-%{_bindir}/%{name}-ecc
-%{_bindir}/%{name}-fs
-%{_bindir}/%{name}-gns
-%{_bindir}/%{name}-gns-proxy-setup-ca
-%{_bindir}/%{name}-identity
-%{_bindir}/%{name}-namecache
-%{_bindir}/%{name}-namestore
-%{_bindir}/%{name}-nat
-%{_bindir}/%{name}-nat-auto
-%{_bindir}/%{name}-nat-server
-%{_bindir}/%{name}-nse
-%{_bindir}/%{name}-peerinfo
-%{_bindir}/%{name}-peerstore
-%{_bindir}/%{name}-publish
-%{_bindir}/%{name}-resolver
-%{_bindir}/%{name}-revocation
-%{_bindir}/%{name}-scalarproduct
-%{_bindir}/%{name}-scrypt
-%{_bindir}/%{name}-search
-%{_bindir}/%{name}-secretsharing-profiler
-%{_bindir}/%{name}-set-profiler
-%{_bindir}/%{name}-statistics
-%{_bindir}/%{name}-testbed-profiler
-%{_bindir}/%{name}-testing
-%{_bindir}/%{name}-transport
-%{_bindir}/%{name}-transport-certificate-creation
-%{_bindir}/%{name}-unindex
-%{_bindir}/%{name}-uri
-%{_bindir}/%{name}-vpn
-%{_bindir}/%{name}-zoneimport
-
-%{_datadir}/%{name}
-
-# libexec dir
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/libexec
-%{_libdir}/%{name}/libexec/%{name}-communicator-unix
-%{_libdir}/%{name}/libexec/%{name}-daemon-exit
-%{_libdir}/%{name}/libexec/%{name}-daemon-latency-logger
-%{_libdir}/%{name}/libexec/%{name}-daemon-pt
-%{_libdir}/%{name}/libexec/%{name}-daemon-regexprofiler
-%{_libdir}/%{name}/libexec/%{name}-daemon-testbed-blacklist
-%{_libdir}/%{name}/libexec/%{name}-daemon-testbed-underlay
-%{_libdir}/%{name}/libexec/%{name}-daemon-topology
-%{_libdir}/%{name}/libexec/%{name}-dns2gns
-%{_libdir}/%{name}/libexec/%{name}-helper-audio-playback
-%{_libdir}/%{name}/libexec/%{name}-helper-audio-record
-%{_libdir}/%{name}/libexec/%{name}-helper-dns
-%{_libdir}/%{name}/libexec/%{name}-helper-exit
-%{_libdir}/%{name}/libexec/%{name}-helper-fs-publish
-%{_libdir}/%{name}/libexec/%{name}-helper-nat-client
-%{_libdir}/%{name}/libexec/%{name}-helper-nat-server
-%{_libdir}/%{name}/libexec/%{name}-helper-testbed
-%{_libdir}/%{name}/libexec/%{name}-helper-vpn
-%{_libdir}/%{name}/libexec/%{name}-namestore-fcfsd
-%{_libdir}/%{name}/libexec/%{name}-service-arm
-%{_libdir}/%{name}/libexec/%{name}-service-ats
-%{_libdir}/%{name}/libexec/%{name}-service-ats-new
-%{_libdir}/%{name}/libexec/%{name}-service-cadet
-%{_libdir}/%{name}/libexec/%{name}-service-consensus
-%{_libdir}/%{name}/libexec/%{name}-service-conversation
-%{_libdir}/%{name}/libexec/%{name}-service-core
-%{_libdir}/%{name}/libexec/%{name}-service-datastore
-%{_libdir}/%{name}/libexec/%{name}-service-dht
-%{_libdir}/%{name}/libexec/%{name}-service-dns
-%{_libdir}/%{name}/libexec/%{name}-service-evil-consensus
-%{_libdir}/%{name}/libexec/%{name}-service-fs
-%{_libdir}/%{name}/libexec/%{name}-service-gns
-%{_libdir}/%{name}/libexec/%{name}-service-identity
-%{_libdir}/%{name}/libexec/%{name}-service-namecache
-%{_libdir}/%{name}/libexec/%{name}-service-namestore
-%{_libdir}/%{name}/libexec/%{name}-service-nat
-%{_libdir}/%{name}/libexec/%{name}-service-nat-auto
-%{_libdir}/%{name}/libexec/%{name}-service-nse
-%{_libdir}/%{name}/libexec/%{name}-service-peerinfo
-%{_libdir}/%{name}/libexec/%{name}-service-peerstore
-%{_libdir}/%{name}/libexec/%{name}-service-regex
-%{_libdir}/%{name}/libexec/%{name}-service-resolver
-%{_libdir}/%{name}/libexec/%{name}-service-revocation
-%{_libdir}/%{name}/libexec/%{name}-service-scalarproduct-alice
-%{_libdir}/%{name}/libexec/%{name}-service-scalarproduct-bob
-%{_libdir}/%{name}/libexec/%{name}-service-scalarproduct-ecc-alice
-%{_libdir}/%{name}/libexec/%{name}-service-scalarproduct-ecc-bob
-%{_libdir}/%{name}/libexec/%{name}-service-secretsharing
-%{_libdir}/%{name}/libexec/%{name}-service-set
-%{_libdir}/%{name}/libexec/%{name}-service-statistics
-%{_libdir}/%{name}/libexec/%{name}-service-testbed
-%{_libdir}/%{name}/libexec/%{name}-service-testbed-logger
-%{_libdir}/%{name}/libexec/%{name}-service-transport
-%{_libdir}/%{name}/libexec/%{name}-service-vpn
-%{_libdir}/%{name}/libexec/%{name}-service-zonemaster
-%{_libdir}/%{name}/libexec/%{name}-service-zonemaster-monitor
-%{_libdir}/%{name}/libexec/%{name}-timeout
-%{_libdir}/%{name}/lib%{name}_plugin_namestore_heap.so
-%{_libdir}/%{name}/lib%{name}_plugin_peerstore_sqlite.so
-
-%dir %{_sysconfdir}/%{name}
-%config %{_sysconfdir}/%{name}/*.conf
-%config(noreplace) %{_sysconfdir}/%{name}.conf
-
-%{_mandir}/man?/%{name}*.?%{ext_info}
-
-%{_infodir}/%{name}*%{ext_info}
-%{_infodir}/images/
-
-%{_sbindir}/rc%{name}
-%{_unitdir}/%{name}.service
-%{_sysusersdir}/%{name}.conf
-%{_tmpfilesdir}/%{name}.conf
-%if 0%{?suse_version} < 1500
-%dir %{_sysusersdir}
-%endif
-
-%files -n lib%{name}
-%{_libdir}/lib%{name}*.so.*
-
-%files plugins
-%dir %{_libdir}/%{name}/nss
-%{_libdir}/%{name}/nss/libnss_gns.so??
-%{_libdir}/%{name}/nss/libnss_gns?.so??
-%{_libdir}/%{name}/lib%{name}_plugin_ats*.so
-%{_libdir}/%{name}/lib%{name}_plugin_block*.so
-%{_libdir}/%{name}/lib%{name}_plugin_datacache_heap.so
-%{_libdir}/%{name}/lib%{name}_plugin_datastore_heap.so
-%{_libdir}/%{name}/lib%{name}_plugin_gnsrecord*.so
-%{_libdir}/%{name}/lib%{name}_plugin_test.so
-%{_libdir}/%{name}/lib%{name}_plugin_transport*.so
-
-%files mysql
-%{_libdir}/%{name}/lib%{name}_plugin_datastore_mysql.so
-
-%files postgresql
-%{_libdir}/%{name}/lib%{name}_plugin_datacache_postgres.so
-%{_libdir}/%{name}/lib%{name}_plugin_datastore_postgres.so
-%{_libdir}/%{name}/lib%{name}_plugin_namecache_postgres.so
-%{_libdir}/%{name}/lib%{name}_plugin_namestore_postgres.so
-
-%files sqlite
-%{_libdir}/%{name}/lib%{name}_plugin_datacache_sqlite.so
-%{_libdir}/%{name}/lib%{name}_plugin_datastore_sqlite.so
-%{_libdir}/%{name}/lib%{name}_plugin_namecache_sqlite.so
-%{_libdir}/%{name}/lib%{name}_plugin_namestore_sqlite.so
+%doc AUTHORS ChangeLog README*
+%{_bindir}/*
+%{_libdir}/gnunet
+%{_datadir}/gnunet
+%{_mandir}/man1/*.1%{?ext_man}
+%{_mandir}/man5/*.5%{?ext_man}
+%{_infodir}/gnunet.info%{?ext_info}
+%{_sysusersdir}/system-user-gnunet.conf
+%{_datadir}/applications/*.desktop
+%{_unitdir}/gnunet.service
 
 %files devel
+%license COPYING
 %{_includedir}/%{name}
 %{_libdir}/pkgconfig/%{name}*.pc
-%{_libdir}/lib%{name}*.so
+%{_libdir}/*.so
+%{_datadir}/aclocal/gnunet.m4
 
 %files lang -f %{name}.lang
+%license COPYING
 
 %changelog
diff --git a/gnunet.sysusers.in b/gnunet.sysusers.in
deleted file mode 100644
index 701f21e..0000000
--- a/gnunet.sysusers.in
+++ /dev/null
@@ -1,2 +0,0 @@
-u @USER@ - - /var/run/gnunet
-m @USER@ @OTHERGROUP@
diff --git a/gnunet.tmpfile.in b/gnunet.tmpfile.in
deleted file mode 100644
index 10bcb45..0000000
--- a/gnunet.tmpfile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-d /var/lib/gnunet 0750 @USER@ @GROUP@ -
-d /var/log/gnunet 0750 @USER@ @GROUP@ -
-d /var/run/gnunet 0750 @USER@ @GROUP@ -
diff --git a/gnurl-7.64.1.tar.gz b/gnurl-7.64.1.tar.gz
deleted file mode 100644
index bcf4219..0000000
--- a/gnurl-7.64.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ea67d505e2576f00d8a09485e6c04396af75388c17d77087a140f05e0ca2a96
-size 3643690