201 files changed, 4841 insertions, 2565 deletions
diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 000000000..687863811
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,16 @@
+;; Per-directory local variables for GNU Emacs 23 and later.
+((nil
+  . ((fill-column . 78)
+     (tab-width   .  4)
+     (indent-tabs-mode . nil)
+     (show-trailing-whitespace . t)
+     (c-basic-offset . 2)
+     (ispell-check-comments . exclusive)
+     (ispell-local-dictionary . "american")
+     (safe-local-variable-values
+          '((c-default-style . "gnu")
+            (sentence-end-double-space . f)
+        (eval add-hook 'prog-mode-hook #'flyspell-prog-mode)
+        (flyspell-issue-message-flag . f) ; avoid messages for every word
+        )))))
diff --git a/ChangeLog b/ChangeLog
index c5473865e..ecffcf0c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+Wed 03 Apr 2019 01:15:57 PM CEST
+  Fixed a few test case regressions (GNS, FS). -CG
+Mon Apr 1 22:00:00 UTC 2019
+  documentation/buildsystem: manpages and other documentation parts
+  can now be build more controlled again, this fixes the regression
+  in 0.11.0 where documentation was an on/off switch.
+  New introduced: --enable-include-manpages.
+  Fixed: texi2mdoc integration (--enable-texi2mdoc-generation).
+  buildsystem: decrease python dependency to 3.4 from
+  previously 3.7.
+  -ng0
+Tue Mar 12 10:06:17 CET 2019
+  REST: Move back from rest-plugin into respective subsystem directories.
+Mon Mar 11 02:47:55 CET 2019
+  Make configure complain if no working libidn is detected. -CG
+Sat Mar 9 15:58:45 2019 +0100
+  REST: Config option for address bind. Defaults to localhost.
+  GNS: dns2gns/gns-proxy config option for address bind. Defaults to localhost.
+Sat Mar 9 01:58:22 CET 2019
+  gnunet-publish now by default does not expose the creation time,
+  option -d no longer exists, to enable the old behavior use -E. -CG
 Sat Mar 2 14:23:10 2019 +0100
  utils: gnunet-qr.py now installed under pkgshare instead of bin
@@ -5,12 +32,12 @@ Thu Feb 28 19:07:59 CET 2019
  CADET: Fix in order, unrealiable message ordering
 Thu 28 Feb 2019 10:54:58 AM CET
-        Releasing GNUnet 0.11.0. -CG
+  Releasing GNUnet 0.11.0. -CG
 Wed Jun  6 08:28:27 CEST 2018
-        Releasing GNUnet 0.11.0pre66. Let's try to keep a better
+  Releasing GNUnet 0.11.0pre66. Let's try to keep a better
-        ChangeLog again henceforth. -CG
+  ChangeLog again henceforth. -CG
 Sat Jan  7 16:41:34 CET 2017
-        Converting NAT library to new NAT service (and
+  Converting NAT library to new NAT service (and
-        splitting of nat-auto service for auto-configuration). -CG
+  splitting of nat-auto service for auto-configuration). -CG
diff --git a/Makefile.am b/Makefile.am
index fd18d7c3c..f54ff203f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,21 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
+# only documentation (ALL of the documentation)
 if DOCUMENTATION_ONLY
  SUBDIRS = doc
 else
  SUBDIRS = m4 src po pkgconfig
+endif
+# documentation on / off switch (affects all of the documentation)
 if DOCUMENTATION
  SUBDIRS += doc
 endif
+# only manpages, needs "doc" subdir
+if INCLUDE_MANPAGES
+  SUBDIRS += doc
 endif
 if !TALER_ONLY
diff --git a/README b/README
index b5ba741f2..1841bb616 100644
--- a/README
+++ b/README
@@ -1,5 +1,26 @@
                       Welcome to GNUnet
+ToC
+===
+* ToC
+* What is GNUnet?
+* Dependencies
+  o direct dependencies
+  o test suite dependencies
+  o optional dependencies
+  o autotools
+* Requirements
+* How to install
+  o binary packages
+  o Scope of Operating System support
+  o Building GNUnet from source
+* Configuration
+* Usage
+* Hacking GNUnet
+* Running HTTP on port 80 and HTTPS on port 443
+* Further Reading
+* Stay tuned
 What is GNUnet?
 ===============
@@ -31,63 +52,93 @@ Dependencies:
 =============
 These are the direct dependencies for running GNUnet:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- libmicrohttpd      >= 0.9.42
+- Bash                              (for some scripts)
+- gettext
+- gnutls             >= 3.2.12      (highly recommended a gnutls
+                                     linked against libunbound)
+- A curl build against gnutls, or gnurl:
+  * libgnurl         >= 7.35.0      (recommended, available from
+                                     https://gnunet.org/en/gnurl.html)
+  or
+  * libcurl          >= 7.35.0      (alternative to libgnurl)
 - libgcrypt          >= 1.6
- libgnurl           >= 7.35.0      (recommended, available from https://gnunet.org/en/gnurl.html)
- libcurl            >= 7.35.0      (alternative to libgnurl)
 - libunistring       >= 0.9.2
- gnutls             >= 3.2.12      (highly recommended a gnutls linked against libunbound)
 - libidn:
-  - libidn2 (prefered)
+  * libidn2 (prefered)
  or
-  - libidn           >= 1.0
+  * libidn           >= 1.0
- libextractor       >= 0.6.1       (highly recommended)
+- libmicrohttpd      >= 0.9.52
- openssl            >= 1.0         (binary, used to generate X.509 certificate
+- makeinfo           >= 4.8
-                                     for gnunet-gns-proxy-setup-ca)
+- make[*3]
 - nss                               (certutil binary, for
                                     gnunet-gns-proxy-setup-ca)
- libltdl            >= 2.2         (part of GNU libtool)
+- openssl            >= 1.0         (binary, used to generate
- sqlite             >= 3.8         (default database, required)
+                                     X.509 certificate
- mysql              >= 5.1         (alternative to sqlite)
+                                     for gnunet-gns-proxy-setup-ca)
- postgres           >= 9.5         (alternative to sqlite)
+- A Posix shell                       (for some scripts)
 - Texinfo            >= 5.2         [*1]
- makeinfo           >= 4.8
+- libltdl            >= 2.2         (part of GNU libtool)
- make[*3]
+- 1 or more databases:
+  * sqlite           >= 3.8         (default database, required)
+  and/or
+  * mysql            >= 5.1         (alternative to sqlite)
+  and/or
+  * postgres         >= 9.5         (alternative to sqlite)
 - which                             (contrib/apparmor(?), gnunet-bugreport,
-                                     tests (dns, gns, namestore,
+                                     and possibly more)
-                                            scalarproduct) and possibly more)
- gettext
 - zlib
 These are the dependencies for GNUnet's testsuite:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Bash                              (optional (?[*4]), for some tests)
+- Bash                              (for some tests[*4])
- python             >= 3.7         (only python 3.7 is supported)
+- A Posix Shell                     (for some tests)
- python-future      >= 3.7         (only python 3.7 is supported)
+- python             >= 3.4         (3.4 and higher technically supported,
- which
+                                     at least python 3.7 tested to work)
+- base tools
+  - mostly:
+    - bc,
+    - curl,
+    - sed,
+    - awk,
+    - which
 These are the optional dependencies:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- awk                               (for linting tests)
+- Bash                              (for Docker and Vagrant)
+- bluez                             (for bluetooth support)
+- grof                              (for linting of man pages)
+- guile              1.6.4          (or later up to 1.8?, for
+                                     gnunet-download-manager)
+- libextractor       >= 0.6.1       (highly recommended[*5])
+- libjansson
+- libglpk            >= 4.45        (for experimental code)
 - libopus            >= 1.0.1       (for experimental conversation tool)
 - libpulse           >= 2.0         (for experimental conversation tool)
 - libogg             >= 1.3.0       (for experimental conversation tool)
- libnss                            (certtool binary (for convenient installation of GNS proxy))
+- libnss                            (certtool binary (for convenient
+                                     installation of GNS proxy))
 - libzbar            >= 0.10        (for gnunet-qr)
+- libpbc             >= 0.5.14      (for Attribute-Based Encryption and
+                                     Identity Provider functionality)
+- libgabe                           (for Attribute-Based Encryption and
+                                     Identity Provider functionality, from
+                                     https://github.com/schanzen/libgabe)
+- mandoc                            (for linting of man pages, generation of
+                                     html output of man pages)
+- miniupnpc
+- perl5                             (for some utilities)
 - TeX Live           >= 2012        (for gnunet-bcd[*])
 - texi2mdoc                         (for automatic mdoc generation [*2])
- libglpk            >= 4.45        (for experimental code)
- perl5                             (for some utilities)
- guile              1.6.4          (or later up to 1.8?, for gnunet-download-manager)
- bluez                             (for bluetooth support)
- miniupnpc
- libpbc             >= 0.5.14      (for Attribute-Based Encryption and Identity Provider functionality)
- libgabe                           (for Attribute-Based Encryption and Identity Provider functionality,
-                                    from https://github.com/schanzen/libgabe)
 Recommended autotools for compiling the Git version are:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 - autoconf           >= 2.59
 - automake           >= 1.11.1
@@ -115,16 +166,35 @@ Recommended autotools for compiling the Git version are:
     fix in.
 [*4] We are commited  to portable tools and solutions
-     where possible. While the shellscripts work with
+     where possible. New scripts should be Posix SH
-     NetBSD's sh, there's no warranty some bashisms
+     compatible, current and older scripts are
-     are leftover.
+     in the process of being rewritten to comply
+     with this requirement.
+[*5] While libextractor is optional, it is recommended to
+     build gnunet against it. If you install it later,
+     you won't benefit from libextractor.
+     If you are a distributor, we recommend to split
+     LE into basis + plugins rather than making LE
+     an option as an afterthought by the user.
+     LE itself is very small, but its dependency chain
+     on first, second, third etc level can be big.
+     There is a small effect on privacy if your LE build
+     differs from one which includes all
+     plugins (plugins are build as shared objects):
+     if users publish a directory with a mixture of file
+     types (for example mpeg, jpeg, png, gif) the
+     configuration of LE could leak which plugins are
+     installed for which filetypes are not providing
+     more details.
+     However, this leak is just a minor concern.
 Requirements
 ============
 GNUnet's directed acyclic graph (DAG) will require around 0.74 GiB
-Diskspace, with GNUNet itself taking around 9.2 MiB reported by the
+Diskspace, with GNUNet itself taking around 8 - 9.2 MiB reported by
-build on GNU Guix.
+the build on GNU Guix.
 How to install?
 ===============
@@ -365,7 +435,7 @@ together with a description.  To publish files on GNUnet, use the
 "gnunet-publish" command.
-The GTK+ (or: Gimp Toolkit) user interface is shipped separately.
+The GTK user interface is shipped separately.
 After installing gnunet-gtk, you can invoke the setup tool and
 the file-sharing GUI with:
@@ -400,13 +470,13 @@ $ make install
 $ export $GNUNET_PREFIX=$SOMEWHERE
 $ make check
-Some of the testcases require python >= 3.7, and the python modules
+Some of the testcases require python >= 3.7, and the python module
-"python-future" (http://python-future.org/) and "pexpect" to be installed.
+"pexpect" to be installed.
 If any testcases fail to pass on your system, run
 "contrib/scripts/gnunet-bugreport" (in the repository) or "gnunet-bugreport"
 when you already have GNUnet installed and report its output together with
 information about the failing testcase(s) to the Mantis bugtracking
-system at https://gnunet.org/bugs/.
+system at https://bugs.gnunet.org/.
 Running HTTP on port 80 and HTTPS on port 443
@@ -464,13 +534,13 @@ Further Reading
  GNUnet or projects around GNUnet.
  There are currently 2 ways to get them:
-  * Using git:
+  * Using git (NOTE: 1.1 GiB as of 2019-03-09):
    git clone https://git.gnunet.org/bibliography.git
  * Using Drupal:
    https://old.gnunet.org/bibliography
  The Drupal access will be replaced by a new interface to our
-  bibliography in 2019.
+  bibliography in the foreseeable future.
 Stay tuned
diff --git a/configure.ac b/configure.ac
index 851f6543b..793612df3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,12 +208,17 @@ AM_CONDITIONAL(HAVE_SSH_KEY,  ssh -D 12345 -o "BatchMode yes" -o "UserKnownHosts
 rm -f /tmp/gnunet_test_cosks_ssh_garbage
 # autotools' m4 for python has no maximum version!
-# python3.7 for tests
+# python3.4 - python3.7 for tests
-m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python3 python3.7 python])
+m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python3 python3.4 python3.5 python3.6 python3.7 python])
-AM_PATH_PYTHON([3.7],, [:])
+AM_PATH_PYTHON([3.4],, [:])
 AC_SUBST([PYTHON])
 AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+# perl
+AC_PATH_PROG( PERL, perl, ,
+              $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin )
+AC_SUBST([PERL])
 # iptables is a soft requirement to run tests
 AC_PATH_TARGET_TOOL(VAR_IPTABLES_BINARY, iptables, false)
@@ -312,6 +317,10 @@ then
 fi
 AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", [required libgcrypt version])
+AC_CHECK_DECLS([struct in6_ifreq], [], [], [[#include <linux/if_tun.h>]])
 # should the build process be building the documentation?
 AC_MSG_CHECKING(whether to build documentation)
 AC_ARG_ENABLE([documentation],
@@ -328,13 +337,14 @@ else
  AC_DEFINE([DOCUMENTATION],[0],[Not building the documentation])
 fi
+# FIXME: Something is wrong about this in the output of ./configure runs
 AC_MSG_CHECKING(wether to include generated texi2mdoc output in installation)
 AC_ARG_ENABLE([texi2mdoc-generation],
-[AS_HELP_STRING([--disable-texi2mdoc-generation], [do not include generated texi2mdoc output in installation])],
+    [AS_HELP_STRING([--enable-texi2mdoc-generation], [include generated texi2mdoc output in installation])],
-[texi2mdoc-generation=${enableval}],
+    [texi2mdoc_generation=${enableval}],
-[texi2mdoc-generation=yes])
+    [texi2mdoc_generation=no])
-AC_MSG_RESULT($texi2mdoc-generation)
+AC_MSG_RESULT($texi2mdoc_generation)
-if test "x$texi2mdoc-generation" = "xyes"
+if test "x$texi2mdoc_generation" = "xyes"
 then
  if test "$texi2mdoc" = 0
  then
@@ -366,6 +376,21 @@ else
  AC_DEFINE([DOCUMENTATION_ONLY],[0],[Not building only the documentation])
 fi
+# should the build process be including the manpages? (default: yes)
+AC_MSG_CHECKING(whether to include man pages)
+AC_ARG_ENABLE([include-manpages],
+   [AS_HELP_STRING([--disable-include-manpages], [Do not include the man pages in build and installation])],
+   [include_manpages=${enableval}],
+   [include_manpages=yes])
+AC_MSG_RESULT($include_manpages)
+if test "x$include_manpages" = "xyes"
+then
+  AM_CONDITIONAL([INCLUDE_MANPAGES],true)
+  AC_DEFINE([INCLUDE_MANPAGES],[1],[Including the man pages in the build and installation])
+else
+  AM_CONDITIONAL([INCLUDE_MANPAGES],false)
+  AC_DEFINE([INCLUDE_MANPAGES],[0],[Not including the man pages in the build and installation])
+fi
 # Adam shostack suggests the following for Windows:
 # -D_FORTIFY_SOURCE=2 -fstack-protector-all
@@ -684,12 +709,12 @@ AM_CONDITIONAL(HAVE_LIBATOMIC, [test "$have_libatomic" = 1])
 LIBS=$SAVE_LIBS
 CPPFLAGS=$SAVE_CPPFLAGS
-AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false])
+AC_CHECK_HEADERS([glpk.h],[glpk=true],[glpk=false])
 # GLPK must support glpk_init_env, version >= 4.43
-AC_CHECK_LIB([glpk],[glp_init_env],,[gplk=false])
+AC_CHECK_LIB([glpk],[glp_init_env],,[glpk=false])
 # GLPK must support atm MLP presolving, version >= 4.32
-AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]])
+AC_CHECK_MEMBERS(glp_iocp.presolve,,[glpk=false],[[#include <glpk.h>]])
-if test x$gplk = xfalse
+if test "x$glpk" = xfalse
 then
        AM_CONDITIONAL(HAVE_LIBGLPK, false)
        AC_MSG_WARN([ERROR: GNUnet requires GLPK  >= 4.32])
@@ -905,6 +930,9 @@ AS_IF([test x$working_libidn2 = x0],
                                     * --with-libidn])])])])
 AM_CONDITIONAL(HAVE_LIBIDN, test x$working_libidn1 = x1)
+AS_IF([test "$working_libidn1" = 0 -a "$working_libidn2" = 0],
+      [AC_MSG_ERROR([GNUnet requires libidn (or libidn2)])])
 AS_IF([test x$there_can_only_be_one = x0],
      [AC_MSG_FAILURE([Missing dependencies: $MISSING_DEPS])])
@@ -977,7 +1005,7 @@ AC_HEADER_DIRENT
 AC_HEADER_STDC
 # Check for headers that are ALWAYS required
-AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers files]))
+AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers files: fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h]))
@@ -1158,7 +1186,7 @@ AC_ARG_WITH(microhttpd,
        AC_CHECK_HEADERS([microhttpd.h],
          AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
            AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
-              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.42])
+              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.52])
              AC_COMPILE_IFELSE([AC_LANG_SOURCE([
                #include "$native_srcdir/src/include/platform.h"
                #include <microhttpd.h>
@@ -1181,7 +1209,7 @@ AC_ARG_WITH(microhttpd,
          AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
            AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
              EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH"
-              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.42])
+              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.52])
               AC_COMPILE_IFELSE([AC_LANG_SOURCE([
                #include "$native_srcdir/src/include/platform.h"
                #include <microhttpd.h>
@@ -1203,12 +1231,12 @@ AC_ARG_WITH(microhttpd,
    AC_CHECK_HEADERS([microhttpd.h],
      AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
        AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
-          [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.42])
+          [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.52])
              AC_COMPILE_IFELSE([AC_LANG_SOURCE([
                #include "$native_srcdir/src/include/platform.h"
                #include <microhttpd.h>
                #if (MHD_VERSION < 0x0094200)
-                #error needs at least version 0.9.42
+                #error needs at least version 0.9.52
                #endif
               ])],
               [AC_MSG_RESULT(ok)
@@ -1314,6 +1342,7 @@ DATAROOTDIR=$datarootdir
 AC_SUBST(DATAROOTDIR)
 # test for sudo
+# TODO: do we need to change anything for "doas" on openbsd?
 AC_MSG_CHECKING(for sudo)
 AC_ARG_WITH(sudo,
  [  --with-sudo=PATH       path to sudo binary (or just yes)],
@@ -1719,11 +1748,14 @@ AC_DEFINE_UNQUOTED(VCS_VERSION, [$vcs_version], [VCS revision/hash or tarball ve
 AC_CONFIG_FILES([
 Makefile
 contrib/Makefile
+contrib/scripts/Makefile
+contrib/scripts/gnunet-logread/Makefile
 doc/Makefile
 doc/man/Makefile
 doc/doxygen/Makefile
 doc/handbook/Makefile
 doc/tutorial/Makefile
+lint/Makefile
 m4/Makefile
 po/Makefile.in
 src/Makefile
@@ -1819,7 +1851,6 @@ src/vpn/vpn.conf
 src/zonemaster/Makefile
 src/zonemaster/zonemaster.conf
 src/rest/Makefile
-src/rest-plugins/Makefile
 src/abe/Makefile
 src/reclaim-attribute/Makefile
 src/reclaim/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index d83fb8846..ff1d1fbbb 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -5,13 +5,7 @@ tap32dir = $(pkgdatadir)/openvpn-tap32/tapw32/
 tap64dir = $(pkgdatadir)/openvpn-tap32/tapw64/
-noinst_SCRIPTS = \
+SUBDIRS = scripts
- scripts/terminate.py \
- scripts/pydiffer.py \
- scripts/removetrailingwhitespace.py \
- scripts/gnunet_pyexpect.py \
- scripts/gnunet_janitor.py \
- scripts/gnunet-chk.py
 dist_pkgdata_DATA = \
 gns/gns-bcd.html \
@@ -35,6 +29,10 @@ tap64_DATA = \
 3rdparty/Windows/openvpn-tap32/tapw64/OemWin2k.inf
 endif
+INITD_FILES = \
+ services/openrc/gnunet.initd \
+ services/systemd/gnunet.service
 EXTRA_DIST = \
 conf/colorit/colorit.conf \
 conf/editors/eclipse/gnunet_codingstyle.xml \
@@ -42,14 +40,6 @@ EXTRA_DIST = \
 conf/gnunet/no_autostart_above_core.conf \
 conf/nss/nssswitch.conf \
 conf/wireshark/wireshark.lua \
- scripts/coverage.sh \
- scripts/terminate.py.in \
- scripts/gnunet_pyexpect.py.in \
- scripts/gnunet_janitor.py.in \
- scripts/gnunet-chk.py.in \
- scripts/gnunet-bugreport \
- scripts/removetrailingwhitespace.py.in \
- scripts/pydiffer.py.in \
 packages/nix/default.nix \
 packages/nix/gnunet-dev.nix \
 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \
@@ -60,28 +50,8 @@ EXTRA_DIST = \
 3rdparty/Windows/openvpn-tap32/tapw64/OemWin2k.inf \
 3rdparty/Windows/openvpn-tap32/INSTALL \
 3rdparty/Windows/openvpn-tap32/tap32-signed-i386-2.1.zip \
- 3rdparty/Windows/openvpn-tap32/tap32-source-2.1.zip
+ 3rdparty/Windows/openvpn-tap32/tap32-source-2.1.zip \
+ $(INITD_FILES)
-CLEANFILES = \
-  $(noinst_SCRIPTS)
-do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
-# Use SUFFIX Extension rules, they are more portable for every
-# implementation of 'make'.
-# You'll also run into the "'%' is a GNU make extension warning"
-# if you use this:
-#
-#%.py: %.py.in Makefile
-#       $(do_subst) < $< > $@
-#       chmod +x $@
-#
-# instead of this:
-SUFFIXES = .py.in .py
-.py.in.py:
-        $(do_subst) < $< > $@
-        chmod +x $@
 check_PROGRAMS = \
 test_gnunet_prefix
@@ -104,6 +74,7 @@ test_gnunet_prefix_LDADD = \
  $(LIBLTDL) -lunistring $(XLIB)
 pkghellodir= $(pkgdatadir)/hellos
+pkginitddir= $(pkgdatadir)/services
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(pkghellodir)
@@ -114,6 +85,10 @@ install-data-local:
          fi \
        done
        install scripts/gnunet-bugreport $(DESTDIR)$(bindir)/gnunet-bugreport
+        mkdir -p $(DESTDIR)$(pkgdatadir)/services/openrc
+        mkdir -p $(DESTDIR)$(pkgdatadir)/services/systemd
+        install services/openrc/gnunet.initd $(DESTDIR)$(pkginitddir)/openrc/
+        install services/systemd/gnunet.service $(DESTDIR)$(pkginitddir)/systemd/
 dist-hook:
        if test -d $(srcdir)/hellos; then \
diff --git a/contrib/ci/docker/docker-entrypoint.sh b/contrib/ci/docker/docker-entrypoint.sh
index 807d86d6f..db916cce7 100644
--- a/contrib/ci/docker/docker-entrypoint.sh
+++ b/contrib/ci/docker/docker-entrypoint.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 gnunet-arm -s > $HOME/gnunet.log 2>&1
-exec bash
-\ No newline at end of file
+exec bash
diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
index d1678a4a6..adcd7132c 100644
--- a/contrib/docker/Dockerfile
+++ b/contrib/docker/Dockerfile
@@ -35,9 +35,9 @@ RUN apt-get update && \
 # Install GNUrl
 ENV GNURL_VERSION=7.57.0
-RUN wget -O /tmp/gnurl.tar.bz2 https://gnunet.org/sites/default/files/gnurl-${GNURL_VERSION}.tar.bz2  
+RUN wget -O /tmp/gnurl.tar.xz https://ftpmirror.gnu.org/gnu/gnunet/gnurl-${GNURL_VERSION}.tar.xz
 RUN cd /tmp && \
-      tar xvf gnurl.tar.bz2 && \
+      tar xvf gnurl.tar.xz && \
      cd gnurl-${GNURL_VERSION} && \
      autoreconf -i && \
      ./configure \
diff --git a/contrib/gnunet_infrastructure/handbook_pull.sh b/contrib/gnunet_infrastructure/handbook_pull.sh
new file mode 100755
index 000000000..16c7430ae
--- /dev/null
+++ b/contrib/gnunet_infrastructure/handbook_pull.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# This essentially could be solved by:
+# git config pull.rebase true
+# git config rebase.autoStash true
+# but chances are that this is easy to
+# forget.
+# so execute this file on the server
+# instead of setting a git config.
+echo "Running git pull with autoStash and rebase"
+echo "If anything breaks in the future, delete"
+echo "and repeat - it was once considered to"
+echo "be responsible for non-trivial conflicts!"
+echo "We apply this because we need to build the"
+echo "handbook and tutorial without manual interventions."
+git pull --rebase --autostash
diff --git a/contrib/packages/guix/guix-env-py2.scm b/contrib/packages/guix/guix-env-py2.scm
index 6085f96a9..11e5451e2 100644
--- a/contrib/packages/guix/guix-env-py2.scm
+++ b/contrib/packages/guix/guix-env-py2.scm
@@ -102,7 +102,6 @@
         ("zlib" ,zlib)
         ("perl" ,perl)
         ("python-2" ,python-2) ; tests and gnunet-qr
-         ("python2-future" ,python2-future)
         ("jansson" ,jansson)
         ("nss" ,nss)
         ("glib" ,glib "bin")
diff --git a/contrib/packages/guix/notest-guix-env.scm b/contrib/packages/guix/notest-guix-env.scm
index ffb0ec889..1fafd961d 100644
--- a/contrib/packages/guix/notest-guix-env.scm
+++ b/contrib/packages/guix/notest-guix-env.scm
@@ -100,7 +100,6 @@
         ("zlib" ,zlib)
         ("perl" ,perl)
         ("python-2" ,python-2) ; tests and gnunet-qr
-         ("python2-future" ,python2-future)
         ("jansson" ,jansson)
         ("nss" ,nss)
         ("glib" ,glib "bin")
diff --git a/contrib/scripts/Makefile.am b/contrib/scripts/Makefile.am
new file mode 100644
index 000000000..a9eadf337
--- /dev/null
+++ b/contrib/scripts/Makefile.am
@@ -0,0 +1,43 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+SUBDIRS = gnunet-logread
+noinst_SCRIPTS = \
+ terminate.py \
+ pydiffer.py \
+ removetrailingwhitespace.py \
+ gnunet_pyexpect.py \
+ gnunet_janitor.py \
+ gnunet-chk.py
+EXTRA_DIST = \
+ coverage.sh \
+ terminate.py.in \
+ gnunet_pyexpect.py.in \
+ gnunet_janitor.py.in \
+ gnunet-chk.py.in \
+ gnunet-bugreport \
+ removetrailingwhitespace.py.in \
+ pydiffer.py.in
+CLEANFILES = \
+  $(noinst_SCRIPTS)
+do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+# Use SUFFIX Extension rules, they are more portable for every
+# implementation of 'make'.
+# You'll also run into the "'%' is a GNU make extension warning"
+# if you use this:
+#
+#%.py: %.py.in Makefile
+#       $(do_subst) < $< > $@
+#       chmod +x $@
+#
+# instead of this:
+SUFFIXES = .py.in .py
+.py.in.py:
+        $(do_subst) < $< > $@
+        chmod +x $@
diff --git a/contrib/scripts/build_cscope.sh b/contrib/scripts/build_cscope.sh
new file mode 100644
index 000000000..ee48f9b54
--- /dev/null
+++ b/contrib/scripts/build_cscope.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+find . -name "*.c" -o -name "*.cpp" -o -name "*.h" -o -name "*.hpp" -o -name "*.py" -o -name "*.sh" > cscope.files
+cscope -q -R -b -i cscope.files
diff --git a/contrib/scripts/debug b/contrib/scripts/debug
index 3de2c9a14..c20ebd7dc 100755
--- a/contrib/scripts/debug
+++ b/contrib/scripts/debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # /proc/sys/kernel/core_pattern should be core.%p.%E
 COREPID=$1
diff --git a/contrib/scripts/texinfo-hacks.el b/contrib/scripts/doc/texinfo-hacks.el
index bfb5c98fa..bfb5c98fa 100644
--- a/contrib/scripts/texinfo-hacks.el
+++ b/contrib/scripts/doc/texinfo-hacks.el
diff --git a/contrib/scripts/documentation/gnunet-doc.scm b/contrib/scripts/documentation/gnunet-doc.scm
deleted file mode 100644
index 077efacad..000000000
--- a/contrib/scripts/documentation/gnunet-doc.scm
+++ /dev/null
@@ -1,182 +0,0 @@
-;;; This file is part of GNUnet.
-;;; Copyright (C) 2016, 2017 GNUnet e.V.
-;;;
-;;; GNUnet is free software: you can redistribute it and/or modify it
-;;; under the terms of the GNU Affero General Public License as published
-;;; by the Free Software Foundation, either version 3 of the License, or
-;;; (at your option) any later version.
-;;;
-;;; GNUnet is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Affero General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU Affero General Public License
-;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-;;;
-(use-modules
- (ice-9 popen)
- (ice-9 match)
- (ice-9 rdelim)
- (guix packages)
- (guix build-system gnu)
- (guix gexp)
- ((guix build utils) #:select (with-directory-excursion))
- (guix git-download)
- (guix utils) ; current-source-directory
- (gnu packages)
- (gnu packages aidc)
- (gnu packages autotools)
- (gnu packages backup)
- (gnu packages base)
- (gnu packages compression)
- (gnu packages curl)
- (gnu packages databases)
- (gnu packages file)
- (gnu packages gettext)
- (gnu packages glib)
- (gnu packages gnome)
- (gnu packages gnunet)
- (gnu packages gnupg)
- (gnu packages gnuzilla)
- (gnu packages groff)
- (gnu packages gstreamer)
- (gnu packages gtk)
- (gnu packages guile)
- (gnu packages graphviz)
- (gnu packages image)
- (gnu packages image-viewers)
- (gnu packages libidn)
- (gnu packages libunistring)
- (gnu packages linux)
- (gnu packages maths)
- (gnu packages multiprecision)
- (gnu packages perl)
- (gnu packages pkg-config)
- (gnu packages pulseaudio)
- (gnu packages python)
- (gnu packages tex)
- (gnu packages texinfo)
- (gnu packages tex)
- (gnu packages tls)
- (gnu packages video)
- (gnu packages web)
- (gnu packages xiph)
- ;;(gnunet packages texlive) ;GNUnet module including texlive-2012 WIP
- ((guix licenses) #:prefix license:))
-;;(define %source-dir (string-append (current-source-directory)
-;;                                   "/../../../"))
-(define %source-dir (dirname (current-filename)))
-(define gnunet-doc
-  (let* ((revision "2")
-         (select? (delay (or (git-predicate
-                              (string-append (current-source-directory)
-                                             "/../../../"))
-                             source-file?))))
-    (package
-      (name "gnunet-doc")
-      (version (string-append "0.10.1-" revision "." "dev"))
-      (source
-       (local-file ;;"../../.."
-        ;;%source-dir
-        ;;(string-append (getcwd) "/../../../")
-        (string-append (getcwd)) ;drrty hack and this assumes one static position FIXME!
-        #:recursive? #t))
-      ;;#:select? (git-predicate %source-dir)))
-      ;;#:select? (force select?)))
-      (build-system gnu-build-system)
-      (inputs
-       `(("glpk" ,glpk)
-         ("gnurl" ,gnurl)
-         ("gstreamer" ,gstreamer)
-         ("gst-plugins-base" ,gst-plugins-base)
-         ("gnutls/dane" ,gnutls/dane)
-         ("libextractor" ,libextractor)
-         ("libgcrypt" ,libgcrypt)
-         ("libidn" ,libidn)
-         ("libmicrohttpd" ,libmicrohttpd)
-         ("libltdl" ,libltdl)
-         ("libunistring" ,libunistring)
-         ("openssl" ,openssl)
-         ("opus" ,opus)
-         ("pulseaudio" ,pulseaudio)
-         ("sqlite" ,sqlite)
-         ("postgresql" ,postgresql)
-         ("mysql" ,mariadb)
-         ("zlib" ,zlib)
-         ("perl" ,perl)
-         ("python-2" ,python-2) ; tests and gnunet-qr
-         ("jansson" ,jansson)
-         ("nss" ,nss)
-         ("glib" ,glib "bin")
-         ("gmp" ,gmp)
-         ("bluez" ,bluez) ; for optional bluetooth feature
-         ("glib" ,glib)
-         ;;("texlive-minimal" ,texlive-minimal) ; optional.
-         ("texlive" ,texlive) ;TODO: Stabilize Texlive-2012 package
-         ("libogg" ,libogg)))
-      (native-inputs
-       `(("pkg-config" ,pkg-config)
-         ("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("gnu-gettext" ,gnu-gettext)
-         ("graphviz" ,graphviz) ; dot
-         ("texinfo-5" ,texinfo-5) ; Debian stable
-         ("which" ,which)
-         ("libtool" ,libtool)))
-      (arguments
-       `(#:configure-flags
-         (list "--enable-documentation")
-         #:tests? #f ;Don't run tests
-         #:phases
-         (modify-phases %standard-phases
-           (add-after 'unpack 'autoconf
-             (lambda _
-               (substitute* "bootstrap"
-                 (("contrib/pogen.sh") "sh contrib/pogen.sh"))
-               (for-each (lambda (f) (chmod f #o755))
-                         (find-files "po" ""))
-               (zero? (system* "sh" "bootstrap"))))
-           (add-after 'build 'run-gendocs
-             (lambda _
-               (chdir "doc/documentation")
-               ;;(zero? (system* "make" "dev-build"))))
-               (zero? (system* "sh" "run-gendocs.sh"))))
-           ;; (zero? (system* "make" "pdf"))
-           ;; (zero? (system* "make" "html"))
-           ;; (zero? (system* "make" "info"))))
-           ;;(zero? (system* "make" "doc-all-give-me-the-noise"))))
-           (replace 'install
-             (lambda _
-               (zero? (system* "make" "doc-gendoc-install")))))))
-      ;;(lambda* (#:key outputs #:allow-other-keys)
-      ;; (let* ((out (assoc-ref outputs "out"))
-      ;;        (doc (string-append out "/share/doc/gnunet")))
-      ;;   (mkdir-p doc)
-      ;;   (copy-recursively "images"
-      ;;                     (string-append doc
-      ;;                                    "/images"))
-      ;;   (mkdir-p (string-append doc "/gnunet"))
-      ;;   (install-file "gnunet.pdf" doc)
-      ;;   (install-file "gnunet.info" doc)
-      ;;   (install-file "gnunet.log" doc) ;TODO: Move to 'dev' output?
-      ;;   (copy-recursively "gnunet"
-      ;;                     (string-append doc
-      ;;                                    "/gnunet"))
-      ;;   (install-file "gnunet-c-tutorial.pdf" doc)
-      ;;   (install-file "gnunet-c-tutorial.info" doc)
-      ;;   (install-file "gnunet-c-tutorial.log" doc) ;TODO: Move to 'dev' output?
-      ;;   (copy-recursively "gnunet-c-tutorial"
-      ;;                     (string-append doc
-      ;;                                    "/gnunet-c-tutorial")))
-      ;; #t)))))
-      (synopsis "Documentation of GNUnet")
-      (description
-       "GNUnet documentation build")
-      (license (list license:fdl1.3+ license:gpl3+))
-      (home-page "https://gnunet.org/"))))
-gnunet-doc
diff --git a/contrib/scripts/find_typedefs.py b/contrib/scripts/find_typedefs.py
index b344cee2b..804eae235 100644
--- a/contrib/scripts/find_typedefs.py
+++ b/contrib/scripts/find_typedefs.py
@@ -1,7 +1,5 @@
 # XXX (F841): local variable 'li' is assigned to but never used
-from __future__ import print_function
-from __future__ import unicode_literals
 import os
 import re
 import sys
diff --git a/contrib/scripts/gdb-iterate-dll.py b/contrib/scripts/gdb-iterate-dll.py
index 388ef6e11..79d46aa96 100644
--- a/contrib/scripts/gdb-iterate-dll.py
+++ b/contrib/scripts/gdb-iterate-dll.py
@@ -1,6 +1,3 @@
-from __future__ import print_function
-from __future__ import unicode_literals
-from builtins import str
 from gdb import *
diff --git a/contrib/scripts/gnunet-bugreport b/contrib/scripts/gnunet-bugreport
index e7d9caa7e..0e268bba7 100755
--- a/contrib/scripts/gnunet-bugreport
+++ b/contrib/scripts/gnunet-bugreport
@@ -1,5 +1,34 @@
 #!/bin/sh
+progname=${0##*/}
+statusmsg()
+{
+    echo "    $@"
+}
+infomsg()
+{
+    statusmsg "INFO:    $@"
+}
+warningmsg()
+{
+    statusmsg "WARNING: $@"
+}
+errormsg()
+{
+    statusmsg "ERROR:   $@"
+}
+linemsg()
+{
+    statusmsg "========================================="
+}
+# It is okay to assume which(1) here because we provide
+# more than 1 fallback.
 TEST=`type type|grep not`
 if test -n "$TEST"; then
  WHICH=which
@@ -7,229 +36,343 @@ else
  WHICH=type
 fi
-echo "Please submit the following information with your bug report: "
+os_check()
-echo "--------------------------------------------------------------"
+{
-OS=`uname -s 2>/dev/null`
+    OS=`uname -s 2>/dev/null`
-echo "OS             : $OS"
+    infomsg "OS             : $OS"
-REL=`uname -r 2>/dev/null`
+    REL=`uname -r 2>/dev/null`
-echo "OS RELEASE     : $REL"
+    infomsg "OS RELEASE     : $REL"
-HW=`uname -m 2>/dev/null`
+    HW=`uname -m 2>/dev/null`
-echo "HARDWARE       : $HW"
+    infomsg "HARDWARE       : $HW"
+}
-TEST=`$WHICH gcc 2>/dev/null`
+# We shouldn't use awk to test for awk... but if
-if test -n "$TEST"; then
+# awk isn't there it can't be found.
-  VERS=`gcc --version 2>/dev/null | head -n 1`
+awk_check()
-  echo "gcc            : $VERS"
+{
-else
+    if test -n "`awk 2>&1 | tail -1 | awk '{print $1}'`"; then
-  echo "gcc            : Not Found";
+        infomsg    "awk            : Found"
-fi
+    else
+        warningmsg "awk            : Not found!"
+    fi
+}
-TEST=`$WHICH cc 2>/dev/null`
+gcc_check()
-if test -n "$TEST"; then
+{
-  VERS=`cc --version 2>/dev/null | head -n 1`
+    TEST=`$WHICH gcc 2>/dev/null`
-  echo "cc             : $VERS"
+    if test -n "$TEST"; then
-else
+        VERS=`gcc --version 2>/dev/null | head -n 1`
-  echo "cc             : Not Found";
+        infomsg "gcc            : $VERS"
-fi
+        # The elif will work in bourne shells, no other shells tested.
+    elif test -n "`gcc 2>&1 | tail -1 | awk '{print $1}'`"; then
+        VERS=`gcc --version 2>/dev/null | head -n 1`
+        infomsg "gcc             : $VERS"
+    else
+        warningmsg "gcc            : Not Found";
+    fi
+}
-TEST=`$WHICH c++ 2>/dev/null`
+cc_check()
-if test -n "$TEST"; then
+{
-  VERS=`c++ --version 2>/dev/null | head -n 1`
+    TEST=`$WHICH cc 2>/dev/null`
-  echo "c++            : $VERS"
+    if test -n "$TEST"; then
-else
+        VERS=`cc --version 2>/dev/null | head -n 1`
-  echo "c++            : Not Found";
+        infomsg "cc             : $VERS"
-fi
+    else
+        warningmsg "cc             : Not Found";
+    fi
+}
-TEST=`$WHICH gmake 2>/dev/null`
+cplusplus_check()
-if test -n "$TEST" ; then
+{
-        gmake --version 2>/dev/null |\
+    TEST=`$WHICH c++ 2>/dev/null`
-                awk -F, '{print $1}' |\
+    if test -n "$TEST"; then
-                awk '/GNU Make/{print "GNU gmake      :",$NF}'
+        VERS=`c++ --version 2>/dev/null | head -n 1`
-else
+        infomsg "c++            : $VERS"
-  TEST=`make --version 2>/dev/null`
+    else
-  if test -n "$TEST"; then
+        warningmsg "c++            : Not Found";
-                make --version 2>/dev/null |\
+    fi
-                        awk -F, '{print $1}' |\
+}
-                        awk '/GNU Make/{print "make           :",$NF}'
-  else
-                echo "make           : Not Found"
-  fi
-fi
-TEST=`$WHICH autoconf 2>/dev/null`
+gmake_check()
-if test -n "$TEST"; then
+{
-  autoconf --version |\
+    TEST=`$WHICH gmake 2>/dev/null`
-    head -n 1 |\
+    if test -n "$TEST" ; then
-    awk '{\
+        gmake --version 2>/dev/null |\
+            awk -F, '{print $1}' |\
+            awk '/GNU Make/{print "GNU gmake      :",$NF}'
+    else
+        # FIX this test.
+        TEST=`make --version 2>/dev/null`
+        if test -n "$TEST"; then
+            make --version 2>/dev/null |\
+                awk -F, '{print $1}' |\
+                awk '/GNU Make/{print "gmake           :",$NF}'
+        else
+            warningmsg "gmake           : Not Found"
+        fi
+    fi
+}
+# Applies for NetBSD make and possibly every make.
+make_check()
+{
+    if test -n "`make 2>/dev/null`"; then
+        infomsg    "make           : Found"
+    else
+        warningmsg "make           : Not Found"
+    fi
+}
+autoconf_check()
+{
+    TEST=`$WHICH autoconf 2>/dev/null`
+    if test -n "$TEST"; then
+        autoconf --version |\
+            head -n 1 |\
+            awk '{\
        if (length($4) == 0) {\
                print "autoconf       : "$3\
        } else {\
                print "autoconf       : "$4\
        }}'
-else
+    else
-  echo "autoconf       : Not Found"
+        warningmsg "autoconf       : Not Found"
-fi
+    fi
+}
-TEST=`$WHICH automake 2>/dev/null`
+automake_check()
-if test -n "$TEST"; then
+{
-  automake --version 2>/dev/null |\
+    TEST=`$WHICH automake 2>/dev/null`
-    head -n 1 |\
+    if test -n "$TEST"; then
-    awk '{print "automake       : "$4}'
+        automake --version 2>/dev/null |\
-else
+            head -n 1 |\
-  echo "automake       : Not Found"
+            awk '{print "automake       : "$4}'
-fi
+    else
+        warningmsg "automake       : Not Found"
+    fi
+}
-TEST=`$WHICH libtool 2>/dev/null`
+# TODO: More libtool variants.
-if test -n "$TEST"; then
+libtool_check()
-  libtool --version 2>/dev/null |\
+{
-    head -n 1 |\
+    TEST=`$WHICH libtool 2>/dev/null`
-    awk '{print "libtool        : "$4}'
+    if test -n "$TEST"; then
-else
+        libtool --version 2>/dev/null |\
-  echo "libtool        : Not Found"
+            head -n 1 |\
-fi
+            awk '{print "libtool        : "$4}'
+    else
+        warningmsg "libtool        : Not Found"
+    fi
+}
-TEST=`$WHICH extract 2>/dev/null`
+libextractor_check()
-if test -n "$TEST"; then
+{
-  extract -v 2>/dev/null |\
+    TEST=`$WHICH extract 2>/dev/null`
-    head -n 1 |\
+    if test -n "$TEST"; then
-    awk '{print "libextractor   : "$2}'
+        extract -v 2>/dev/null |\
-else
+            head -n 1 |\
-  echo "libextractor   : Not Found"
+            awk '{print "libextractor   : "$2}'
-fi
+    else
+        warningmsg "libextractor   : Not Found"
+    fi
+}
-if test -x gnunetd; then
+gnunet08_check()
-  gnunetd -v | sed -e "s/v//" 2>/dev/null |\
+{
-    awk '{print "GNUnet 0.8     : "$2 (may conflict!)}'
+    if test -x gnunetd; then
-else
+        gnunetd -v | sed -e "s/v//" 2>/dev/null |\
-  echo "GNUnet 0.8     : Not Found (good)"
+            awk '{print "GNUnet 0.8     : "$2 (may conflict!)}'
-fi
+    else
+        infomsg "GNUnet 0.8     : Not Found (good)"
+    fi
+}
-TEST=`$WHICH gnunet-arm 2>/dev/null`
+gnunet09x_check()
-if test -n "$TEST"; then
+{
-  gnunet-arm -v | sed -e "s/v//" 2>/dev/null |\
+    TEST=`$WHICH gnunet-arm 2>/dev/null`
-    awk '{print "GNUnet 0.9     : "$2}'
+    if test -n "$TEST"; then
-else
+        gnunet-arm -v | sed -e "s/v//" 2>/dev/null |\
-  echo "GNUnet 0.9     : Not Found"
+            awk '{print "GNUnet 0.9     : "$2}'
-fi
+    else
+        infomsg "GNUnet 0.9     : Not Found (good)"
+    fi
+}
-TEST=`$WHICH libgcrypt-config 2> /dev/null`
+gnunet011x_check()
-if test -n "$TEST"; then
+{
-  libgcrypt-config --version 2> /dev/null | \
+    TEST=`$WHICH gnunet-arm 2>/dev/null`
-    awk '{print "libgcrypt      : "$1}'
+    if test -n "$TEST"; then
-else
+        gnunet-arm -v | sed -e "s/v//" 2>/dev/null |\
-  echo "libgcrypt      : Not Found"
+            awk '{print "GNUnet 0.11.x     : "$2}'
-fi
+    else
+        warningmsg "GNUnet 0.11.x     : Not Found"
+    fi
+}
-TEST=`$WHICH mysql_config 2> /dev/null`
+gcrypt_check()
-if test -n "$TEST"; then
+{
-  mysql_config --version 2> /dev/null | \
+    TEST=`$WHICH libgcrypt-config 2> /dev/null`
-    awk '{print "mysql          : "$1}'
+    if test -n "$TEST"; then
-else
+        libgcrypt-config --version 2> /dev/null | \
-  echo "mysql          : Not Found"
+            awk '{print "libgcrypt      : "$1}'
-fi
+    else
+        warningmsg "libgcrypt      : Not Found"
+    fi
+}
-TEST=`$WHICH pkg-config 2> /dev/null`
+mysql_check()
-if test -n "$TEST"; then
+{
-  pkg-config --version 2> /dev/null | \
+    TEST=`$WHICH mysql_config 2> /dev/null`
-    awk '{print "pkg-config     : "$1}'
+    if test -n "$TEST"; then
-else
+        mysql_config --version 2> /dev/null | \
-  echo "pkg-config     : Not Found"
+            awk '{print "mysql          : "$1}'
-fi
+    else
+        infomsg "mysql          : Not Found"
+    fi
+}
-TEST=`$WHICH pkg-config 2> /dev/null`
+pkgconf_check()
-if test -n "$TEST"; then
+{
-  pkg-config --modversion glib-2.0 2> /dev/null | \
+    TEST=`$WHICH pkgconf 2> /dev/null`
-    awk '{print "glib2          : "$1}'
+    if test -n "$TEST"; then
-else
+        pkgconf --version 2> /dev/null | awk '{print "pkgconf     : "$1}'
-  echo "glib2          : Not Found"
+    else
-fi
+        infomsg "pkgconf     : Not Found"
+    fi
+}
+ 
+pkgconfig_check()
+{
+    TEST=`$WHICH pkg-config 2> /dev/null`
+    if test -n "$TEST"; then
+        pkg-config --version 2> /dev/null | \
+            awk '{print "pkg-config     : "$1}'
+    else
+        infomsg "pkg-config     : Not Found"
+    fi
+}
-TEST=`$WHICH pkg-config 2> /dev/null`
+glib2_check()
-if test -n "$TEST"; then
+{
-  pkg-config --modversion gtk+-2.0 2> /dev/null | \
+    TEST=`$WHICH pkg-config 2> /dev/null`
-    awk '{print "gtk2+          : "$1}'
+    if test -n "$TEST"; then
-else
+        pkg-config --modversion glib-2.0 2> /dev/null | \
-  echo "gtk2+          : Not Found"
+            awk '{print "glib2          : "$1}'
-fi
+    else
+        infomsg "glib2          : Not Found"
+    fi
+}
-TEST=`$WHICH dpkg 2> /dev/null`
+gtk2_check()
-if test -n "$TEST"; then
+{
-  LINES=`dpkg -s libgmp-dev | grep Version | wc -l 2> /dev/null`
+    TEST=`$WHICH pkg-config 2> /dev/null`
-  if test "$LINES" = "1"
+    if test -n "$TEST"; then
-  then
+        pkg-config --modversion gtk+-2.0 2> /dev/null | \
-    VERSION=`dpkg -s libgmp-dev | grep Version | awk '{print $2}'`
+            awk '{print "gtk2+          : "$1}'
-    echo "GMP            : libgmp-dev-$VERSION.deb"
+    else
-  else
+        infomsg "gtk2+          : Not Found"
-    echo "GMP            : dpkg: libgmp-dev not installed"
+    fi
-  fi
+}
-else
-  TEST=`$WHICH rpm 2> /dev/null`
-  if test -n "$TEST"; then
-    rpm -q gmp | sed -e "s/gmp-//" 2> /dev/null | \
-      awk '{print "GMP            : "$1.rpm}'
-  else
-    echo "GMP            : Test not available"
-  fi
-fi
-TEST=`$WHICH dpkg 2> /dev/null`
+gmp_check()
-if test -n "$TEST"; then
+{
-  LINES=`dpkg -s libunistring-dev | grep Version | wc -l`
+    TEST=`$WHICH dpkg 2> /dev/null`
-  if test "$LINES" = "1"
+    if test -n "$TEST"; then
-  then
+        LINES=`dpkg -s libgmp-dev | grep Version | wc -l 2> /dev/null`
-    VERSION=`dpkg -s libunistring-dev | grep Version | awk '{print $2}'`
+        if test "$LINES" = "1"
-    echo "libunistring   : libunistring3-dev-$VERSION.deb"
+        then
-  else
+            VERSION=`dpkg -s libgmp-dev | grep Version | awk '{print $2}'`
-    echo "libunistring   : dpkg: libunistring3-dev not installed"
+            infomsg "GMP            : libgmp-dev-$VERSION.deb"
-  fi
+        else
-else
+            errormsg "GMP            : dpkg: libgmp-dev not installed"
-  TEST=`$WHICH rpm 2> /dev/null`
+        fi
-  if test -n "$TEST"; then
+    fi
-    rpm -q unistring | sed -e "s/unistring-//" 2> /dev/null | \
+    TEST=`$WHICH rpm 2> /dev/null`
-      awk '{print "libunistring   : "$1.rpm}'
+    if test -n "$TEST"; then
-  else
+        rpm -q gmp | sed -e "s/gmp-//" 2> /dev/null | \
-    echo "libunistring   : Test not available"
+            awk '{print "GMP            : "$1.rpm}'
-  fi
+    else
-fi
+        warningmsg "GMP            : Test not available"
+    fi
+}
-TEST=`$WHICH pkg_add 2> /dev/null`
+libunistring_check()
-if test -n "$TEST"; then
+{
-  VERSION_UNISTRING=`pkg_info -Nb libunistring`
+    TEST=`$WHICH dpkg 2> /dev/null`
-  VERSION_GMP=`pkg_info -Nb gmp`
+    if test -n "$TEST"; then
-  echo "libunistring     :"
+        LINES=`dpkg -s libunistring-dev | grep Version | wc -l`
-  echo "$VERSION_UNISTRING"
+        if test "$LINES" = "1"
-  echo "GMP              :"
+        then
-  echo "$VERSION_GMP"
+            VERSION=`dpkg -s libunistring-dev | grep Version | awk '{print $2}'`
-fi
+            infomsg "libunistring   : libunistring3-dev-$VERSION.deb"
+        else
+            errormsg "libunistring   : dpkg: libunistring3-dev not installed"
+        fi
+    else
+        TEST=`$WHICH rpm 2> /dev/null`
+        if test -n "$TEST"; then
+            rpm -q unistring | sed -e "s/unistring-//" 2> /dev/null | \
+                awk '{print "libunistring   : "$1.rpm}'
+        else
+            infomsg "libunistring   : Test not available"
+        fi
+    fi
+}
-TEST=`$WHICH gettext 2> /dev/null`
+pkgadd_check()
-if test -n "$TEST"; then
+{
-  gettext --version | head -n1 2> /dev/null | \
+    TEST=`$WHICH pkg_add 2> /dev/null`
-    awk '{print "GNU gettext    : "$4}'
+    if test -n "$TEST"; then
-else
+        VERSION_UNISTRING=`pkg_info -Nb libunistring`
-  echo "GNU gettext    : Not found"
+        VERSION_GMP=`pkg_info -Nb gmp`
-fi
+        echo "libunistring     :"
+        echo "$VERSION_UNISTRING"
+        echo "GMP              :"
+        echo "$VERSION_GMP"
+    fi
+}
+gettext_check()
+{
+    TEST=`$WHICH gettext 2> /dev/null`
+    if test -n "$TEST"; then
+        gettext --version | head -n1 2> /dev/null | \
+            awk '{print "GNU gettext    : "$4}'
+    else
+        errormsg "GNU gettext    : Not found"
+    fi
+}
-TEST=`$WHICH curl-config 2> /dev/null`
+# Merge curl_check + gnurl_check -> error if neither is
-if test -n "$TEST"; then
+# found (yes those systems exist)
-  curl-config --version | head -n1 2> /dev/null | \
+curl_check()
-    awk '{print "libcurl        : "$2}'
+{
-else
+    TEST=`$WHICH curl-config 2> /dev/null`
-  echo "libcurl        : Not found"
+    if test -n "$TEST"; then
-fi
+        curl-config --version | head -n1 2> /dev/null | \
+            awk '{print "libcurl        : "$2}'
+    else
+        infomsg "libcurl        : Not found"
+    fi
+}
-TEST=`$WHICH gnurl-config 2> /dev/null`
+gnurl_check()
-if test -n "$TEST"; then
+{
-  gnurl-config --version | head -n1 2> /dev/null | \
+    TEST=`$WHICH gnurl-config 2> /dev/null`
-    awk '{print "libgnurl       : "$2}'
+    if test -n "$TEST"; then
-else
+        gnurl-config --version | head -n1 2> /dev/null | \
-  echo "libgnurl       : Not found"
+            awk '{print "libgnurl       : "$2}'
-fi
+    else
+        infomsg "libgnurl       : Not found"
+    fi
+}
-echo -n "libmicrohttpd  : "
+libmicrohttpd_check()
-TMPFILE=`mktemp /tmp/mhd-version-testXXXXXX`
+{
-cat - >$TMPFILE.c <<EOF
+    echo -n "libmicrohttpd  : "
+    TMPFILE=`mktemp /tmp/mhd-version-testXXXXXX`
+    cat - >$TMPFILE.c <<EOF
 #include <microhttpd.h>
 #include <stdio.h>
 int main()
@@ -239,13 +382,16 @@ int main()
 }
 EOF
-gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
+    gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
-rm -f $TMPFILE $TMPFILE.bin
+    cc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
+    rm -f $TMPFILE $TMPFILE.bin
+}
-echo -n "GNU GLPK       : "
+glpk_check()
-TMPFILE=`mktemp /tmp/glpk-version-testXXXXXX`
+{
-cat - >$TMPFILE.c <<EOF
+    echo -n "GNU GLPK       : "
+    TMPFILE=`mktemp /tmp/glpk-version-testXXXXXX`
+    cat - >$TMPFILE.c <<EOF
 #include <glpk.h>
 #include <stdio.h>
 int main()
@@ -255,13 +401,16 @@ int main()
 }
 EOF
-gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
+    gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
-rm -f $TMPFILE $TMPFILE.bin
+    cc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
+    rm -f $TMPFILE $TMPFILE.bin
+}
-echo -n "GnuTLS         : "
+gnutls_check()
-TMPFILE=`mktemp /tmp/gnutls-version-testXXXXXX`
+{
-cat - >$TMPFILE.c <<EOF
+    echo -n "GnuTLS         : "
+    TMPFILE=`mktemp /tmp/gnutls-version-testXXXXXX`
+    cat - >$TMPFILE.c <<EOF
 #include <gnutls/gnutls.h>
 #include <stdio.h>
 int main()
@@ -271,8 +420,49 @@ int main()
 }
 EOF
-gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
+    gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
-rm -f $TMPFILE $TMPFILE.bin
+    cc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
+    rm -f $TMPFILE $TMPFILE.bin
+}
+main()
+{
+    infomsg "${progname} 0.11.0"
+    infomsg 
+    infomsg "Please submit the following"
+    infomsg "information with your bug report:"
+    linemsg
+    os_check
+    awk_check
+    gcc_check
+    cc_check
+    cplusplus_check
+    gmake_check
+    make_check
+    autoconf_check
+    automake_check
+    libtool_check
+    libextractor_check
+    gnunet08_check
+    gnunet09x_check
+    gnunet011x_check
+    gcrypt_check
+    mysql_check
+    pkgconf_check
+    pkgconfig_check
+    glib2_check
+    gtk2_check
+    gmp_check
+    libunistring_check
+    pkgadd_check
+    gettext_check
+    curl_check
+    gnurl_check
+    libmicrohttpd_check
+    glpk_check
+    gnutls_check
+    linemsg
+    infomsg "Bug report saved in ./my_gnunet_bugreport.log"
+}
-echo "--------------------------------------------------------------"
+main "$@" 2>&1 | tee "my_gnunet_bugreport.log"
diff --git a/contrib/scripts/gnunet-chk.py.in b/contrib/scripts/gnunet-chk.py.in
index 1f5a0726c..0fb591627 100755
--- a/contrib/scripts/gnunet-chk.py.in
+++ b/contrib/scripts/gnunet-chk.py.in
@@ -21,12 +21,6 @@
 # Brief:   Computes GNUNET style Content Hash Key for a given file
 # Author:  Sree Harsha Totakura
-from __future__ import print_function
-from __future__ import division
-from builtins import str
-from builtins import range
-from past.utils import old_div
-from builtins import object
 from hashlib import sha512
 import logging
 import os
@@ -254,7 +248,7 @@ def compute_chk_offset_(depth, end_offset):
    bds = compute_tree_size_(depth)
    if (depth > 0):
        end_offset -= 1
-    ret = old_div(end_offset, bds)
+    ret = end_offset // bds
    return ret % CHK_PER_INODE
@@ -278,7 +272,7 @@ def compute_iblock_size_(depth, offset):
        ret = CHK_PER_INODE
    else:
        bds /= CHK_PER_INODE
-        ret = old_div(mod, bds)
+        ret = mod // bds
        if (mod % bds) is not 0:
            ret += 1
    return ret
diff --git a/contrib/scripts/gnunet-logread/.gitignore b/contrib/scripts/gnunet-logread/.gitignore
new file mode 100644
index 000000000..070182b2f
--- /dev/null
+++ b/contrib/scripts/gnunet-logread/.gitignore
@@ -0,0 +1,2 @@
+gnunet-logread
+gnunet-logread-ipc-sdedit
diff --git a/contrib/scripts/gnunet-logread/Makefile.am b/contrib/scripts/gnunet-logread/Makefile.am
new file mode 100644
index 000000000..82c99494c
--- /dev/null
+++ b/contrib/scripts/gnunet-logread/Makefile.am
@@ -0,0 +1,22 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+do_subst = $(SED) -e 's,[@]PERL[@],$(PERL),g'
+SUFFIXES = .in
+gnunet-logread: gnunet-logread.in Makefile
+        $(do_subst) < $(srcdir)/gnunet-logread.in > gnunet-logread
+        chmod +x gnunet-logread
+gnunet-logread-ipc-sdedit: gnunet-logread-ipc-sdedit.in Makefile
+        $(do_subst) < $(srcdir)/gnunet-logread-ipc-sdedit.in > gnunet-logread-ipc-sdedit
+        chmod +x gnunet-logread-ipc-sdedit
+CLEANFILES=     \
+                gnunet-logread \
+                gnunet-logread-ipc-sdedit
+noinst_SCRIPTS =                \
+                $(CLEANFILES) \
+                gnunet-logread-ipc
diff --git a/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit b/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit.in
index f8b7dc735..f8b7dc735 100755
--- a/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit
+++ b/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit.in
diff --git a/contrib/scripts/gnunet-logread/gnunet-logread b/contrib/scripts/gnunet-logread/gnunet-logread.in
index 9b1c65401..9b1c65401 100755
--- a/contrib/scripts/gnunet-logread/gnunet-logread
+++ b/contrib/scripts/gnunet-logread/gnunet-logread.in
diff --git a/contrib/scripts/gnunet_janitor.py.in b/contrib/scripts/gnunet_janitor.py.in
index 4ae9ad124..79e32fb90 100644
--- a/contrib/scripts/gnunet_janitor.py.in
+++ b/contrib/scripts/gnunet_janitor.py.in
@@ -22,7 +22,6 @@
 # gnunet janitor can be used by invoking `make' like this:
 # TESTS_ENVIRONMENT='${top_srcdir}/contrib/scripts/gnunet_janitor.py &&' make check
-from __future__ import print_function
 import os
 import re
 import subprocess
diff --git a/contrib/scripts/gnunet_pyexpect.py.in b/contrib/scripts/gnunet_pyexpect.py.in
index 4202da8d0..188436f51 100644
--- a/contrib/scripts/gnunet_pyexpect.py.in
+++ b/contrib/scripts/gnunet_pyexpect.py.in
@@ -18,8 +18,7 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 # Testcase for gnunet-peerinfo
-from __future__ import print_function
-from builtins import object
 import os
 import re
 import subprocess
diff --git a/contrib/scripts/lint-python.sh b/contrib/scripts/lint-python.sh
deleted file mode 100755
index 9f7e0462d..000000000
--- a/contrib/scripts/lint-python.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# check python style (and 2 to 3 migration)
-rm python-lint.log
-if [ -e "python" ]
-then
-    python --version >> python-lint.log
-fi
-if [ -e "python2" ]
-then
-    python2 --version >> python-lint.log
-fi
-if [ -e "python3" ]
-then
-    python3 --version >> python-lint.log
-fi
-flake8 >> python-lint.log
-2to3 -v -d . >> python-lint.log
-2to3 -v -p . >> python-lint.log
diff --git a/contrib/scripts/lint/lint-man.sh b/contrib/scripts/lint/lint-man.sh
new file mode 100755
index 000000000..8915e9ece
--- /dev/null
+++ b/contrib/scripts/lint/lint-man.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# SPDX-License-Identifier: 0BSD
+# spit out ONLY error messages using groff.
+existence()
+{
+    command -v "$1" >/dev/null 2>&1
+}
+if existence groff;
+then
+    echo "groff check"
+    for f in `find . -name \*\.[1-9]`;
+    do
+        LC_ALL=en_US.UTF-8 \
+              MANROFFSEQ='' \
+              MANWIDTH=80 \
+              groff -m mandoc -b -z -w w $f;
+    done
+    # FIXME below, grande stupidity.
+    rm groff_lint.log
+    echo "Wrong use of B"
+    for f in `find . -name \*\.[1-9]`;
+    do
+        awk '/^\.B$/ {print FILENAME":"NR":"$0}' $f >> groff_lint.log || true
+    done
+fi
+echo "mandoc check"
+# spit out ONLY error messages with mandoc:
+if existence mandoc;
+then
+    mandoc -T lint `find . -name \*\.[1-9]`
+fi
+#LC_ALL=en_US.UTF-8 MANROFFSEQ='' MANWIDTH=80 /run/current-system/profile/bin/man --warnings -E UTF-8 -l -Tutf8 -Z <*.5> >report5.log
+#LC_ALL=en_US.UTF-8 MANROFFSEQ='' MANWIDTH=80 /run/current-system/profile/bin/man --warnings -E UTF-8 -l -Tutf8 -Z <*.1> >report1.log
diff --git a/contrib/scripts/lint/lint-python.sh b/contrib/scripts/lint/lint-python.sh
new file mode 100755
index 000000000..0e46719ff
--- /dev/null
+++ b/contrib/scripts/lint/lint-python.sh
@@ -0,0 +1,79 @@
+#!/bin/sh
+# check python style (and 2 to 3 migration)
+#
+# behold, the worst lowest effort shell script
+# ...given that we have more generic checking
+# for executables in other scripts already
+existence()
+{
+    command -v "$1" >/dev/null 2>&1
+}
+# It is assumed that you are in 'lint'.
+LOGFILE="python-lint.log"
+# invoke from root of source!
+if [ $(basename $(pwd)) = "scripts" ]
+then
+   return 1
+else
+    if [ -e "${LOGFILE}" ]
+    then
+        rm ${LOGFILE}
+    fi
+    if existence python;
+    then
+        python --version >> ${LOGFILE}
+    fi
+    if existence python2;
+    then
+        python2 --version >> ${LOGFILE}
+    fi
+    if existence python3;
+    then
+        python3 --version >> ${LOGFILE}
+    fi
+    if existence python3.7;
+    then
+        python3.7 --version >> ${LOGFILE}
+    fi
+    if existence flake8;
+    then
+        echo >> ${LOGFILE}
+        echo "flake8:" >> ${LOGFILE}
+        echo >> ${LOGFILE}
+        flake8 >> ${LOGFILE}
+    fi
+    if existence flake8-3.7;
+    then
+        echo >> ${LOGFILE}
+        echo "flake8:" >> ${LOGFILE}
+        echo >> ${LOGFILE}
+        flake8-3.7 >> ${LOGFILE}
+    fi
+    if existence 2to3;
+    then
+        echo >> ${LOGFILE}
+        echo "2to3" >> ${LOGFILE}
+        echo >> ${LOGFILE}
+        2to3 -v -d . >> ${LOGFILE}
+        2to3 -v -p . >> ${LOGFILE}
+    fi
+    if existence 2to3-3.7;
+    then
+        echo >> ${LOGFILE}
+        echo "2to3" >> ${LOGFILE}
+        echo >> ${LOGFILE}
+        2to3-3.7 -v -d . >> ${LOGFILE}
+        2to3-3.7 -v -p . >> ${LOGFILE}
+    fi
+fi
diff --git a/contrib/scripts/process_log.sh b/contrib/scripts/process_log.sh
index c25c515c2..7b2363a0e 100755
--- a/contrib/scripts/process_log.sh
+++ b/contrib/scripts/process_log.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Usage: service should print "STARTING SERVICE (srvc) for peer [PEER]" where:
 # - "srvc" is the service name (in lowercase, as in the log output).
@@ -23,8 +23,16 @@ rm __tmp_peers
 sed -e "$SED_EXPR" log > .log
 echo "$0 sed regex: $SED_EXPR" >> .log
-SIZE=`stat -c%s .log`
+if [ -n "$(uname -a | grep -q 'Linux')" ]; then
+    # GNU coreutils:
+    SIZE=`stat -c%s .log`
+else
+    # NetBSD, FreeBSD (and others?):
+    SIZE=`stat -f%z .log`
+fi
+# echo $SIZE
-if [[ "`ps aux | grep "kwrite .lo[g]"`" = "" && "$SIZE" < 10000000 ]]; then
+if [ "`ps aux | grep "kwrite .lo[g]"`" = "" -a "$SIZE" -lt "10000000" ]; then
    kwrite .log --geometry 960x1140-960 &
 fi
diff --git a/contrib/scripts/pydiffer.py.in b/contrib/scripts/pydiffer.py.in
index 1dbe856db..35d9ffa35 100644
--- a/contrib/scripts/pydiffer.py.in
+++ b/contrib/scripts/pydiffer.py.in
@@ -1,5 +1,5 @@
 #!@PYTHON@
-from __future__ import print_function
 import os
 import sys
 import difflib
diff --git a/contrib/scripts/pydmesg b/contrib/scripts/pydmesg
index d60e08fe3..9b21359f0 100755
--- a/contrib/scripts/pydmesg
+++ b/contrib/scripts/pydmesg
@@ -8,8 +8,6 @@
 pydmesg: dmesg with human-readable timestamps
 """
-from __future__ import with_statement
 import re
 import subprocess
 import sys
diff --git a/contrib/scripts/revisionary.sh b/contrib/scripts/revisionary.sh
index 5778cf148..a39660d52 100755
--- a/contrib/scripts/revisionary.sh
+++ b/contrib/scripts/revisionary.sh
@@ -16,7 +16,7 @@ CMD_TEST="cd src/transport ; make test_transport_api_tcp; ./test_transport_api_t
 LOGGING=" 1> /dev/null 2> errors.txt"
 LOGFILE="log.txt"
-function output ()
+output ()
 {
  eval echo $1
  eval echo $1 >> $LOGFILE
diff --git a/contrib/scripts/terminate.py.in b/contrib/scripts/terminate.py.in
index 9ed356502..161b4db61 100644
--- a/contrib/scripts/terminate.py.in
+++ b/contrib/scripts/terminate.py.in
@@ -21,7 +21,6 @@
 # For other platforms it's equivalent to Popen.kill ()
 # Requires pywin32 on W32.
-from builtins import object
 import sys
 import subprocess
 import os
diff --git a/contrib/scripts/testbed_cleanup.sh b/contrib/scripts/testbed_cleanup.sh
index 57413fba0..ee0200d44 100755
--- a/contrib/scripts/testbed_cleanup.sh
+++ b/contrib/scripts/testbed_cleanup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 ###################################################################################
 # Script to clean a previous run of testbed which has crashed. This scripts kills #
diff --git a/contrib/uncrustify.cfg b/contrib/uncrustify.cfg
new file mode 100644
index 000000000..a5b78fb7e
--- /dev/null
+++ b/contrib/uncrustify.cfg
@@ -0,0 +1,80 @@
+# Almost the GNU format
+indent_with_tabs                = 0             # 1=indent to level only, 2=indent with tabs
+input_tab_size                  = 8             # original tab size
+output_tab_size                 = 8             # new tab size
+indent_columns                  = 2
+# indent_label                  = 2             # pos: absolute col, neg: relative column
+indent_align_string             = False         # align broken strings
+indent_brace                    = 2
+nl_enum_brace                   = remove        # "enum {" vs "enum \n {"
+nl_union_brace                  = remove        # "union {" vs "union \n {"
+nl_struct_brace                 = remove        # "struct {" vs "struct \n {"
+nl_do_brace                         = add               # "do {" vs "do \n {"
+nl_if_brace                         = add               # "if () {" vs "if () \n {"
+nl_for_brace                    = add           # "for () {" vs "for () \n {"
+nl_else_brace                   = add           # "else {" vs "else \n {"
+nl_while_brace                  = add           # "while () {" vs "while () \n {"
+nl_switch_brace                 = add           # "switch () {" vs "switch () \n {"
+nl_func_var_def_blk             = 1
+nl_before_case                  = 1
+nl_fcall_brace                  = add           # "foo() {" vs "foo()\n{"
+nl_fdef_brace                   = add           # "int foo() {" vs "int foo()\n{"
+# nl_after_return                       = TRUE
+nl_brace_while                  = add
+nl_brace_else                   = add
+nl_squeeze_ifdef                = TRUE
+# mod_paren_on_return           = ignore        # "return 1;" vs "return (1);"
+# mod_full_brace_if             = ignore        # "if (a) a--;" vs "if (a) { a--; }"
+# mod_full_brace_for            = ignore        # "for () a--;" vs "for () { a--; }"
+# mod_full_brace_do             = ignore        # "do a--; while ();" vs "do { a--; } while ();"
+# mod_full_brace_while          = ignore        # "while (a) a--;" vs "while (a) { a--; }"
+sp_before_semi                  = remove
+sp_paren_paren                  = remove        # space between (( and ))
+sp_return_paren                 = remove        # "return (1);" vs "return(1);"
+sp_sizeof_paren                 = remove        # "sizeof (int)" vs "sizeof(int)"
+sp_before_sparen                = force         # "if (" vs "if("
+sp_after_sparen                 = force         # "if () {" vs "if (){"
+sp_after_cast                   = remove        # "(int) a" vs "(int)a"
+sp_inside_braces                = force         # "{ 1 }" vs "{1}"
+sp_inside_braces_struct         = force         # "{ 1 }" vs "{1}"
+sp_inside_braces_enum           = force         # "{ 1 }" vs "{1}"
+sp_inside_paren                 = remove
+sp_inside_fparen                = remove
+sp_inside_sparen                = remove
+#sp_type_func                   = ignore
+sp_assign                       = force
+sp_arith                        = force
+sp_bool                         = force
+sp_compare                      = force
+sp_after_comma                  = force
+sp_func_def_paren               = remove        # "int foo (){" vs "int foo(){"
+sp_func_call_paren              = remove        # "foo (" vs "foo("
+sp_func_proto_paren             = remove        # "int foo ();" vs "int foo();"
+# align_with_tabs                       = FALSE         # use tabs to align
+# align_on_tabstop              = FALSE         # align on tabstops
+# align_enum_equ_span           = 4
+# align_nl_cont                 = TRUE
+# align_var_def_span            = 2
+# align_var_def_inline          = TRUE
+# align_var_def_star            = TRUE
+# align_var_def_colon           = TRUE
+# align_assign_span             = 1
+# align_struct_init_span                = 3
+# align_var_struct_span         = 3
+# align_right_cmt_span          = 3
+# align_pp_define_span          = 3
+# align_pp_define_gap           = 4
+# align_number_right            = TRUE
+# align_typedef_span            = 5
+# align_typedef_gap             = 3
+# cmt_star_cont                 = TRUE
+eat_blanks_before_close_brace   = TRUE
+eat_blanks_after_open_brace     = TRUE
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4443b42f8..eb23b534b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,14 @@
 # This Makefile.am is in the public domain
 if DOCUMENTATION
-  SUBDIRS = man doxygen handbook tutorial
+  SUBDIRS = doxygen handbook tutorial
 endif
 if !DOCUMENTATION
-  SUBDIRS = man doxygen
+  SUBDIRS = doxygen
+endif
+if INCLUDE_MANPAGES
+  SUBDIRS += man
 endif
 EXTRA_DIST =                                                    \
diff --git a/doc/doc.h b/doc/doc.h
index 7dfeb1c42..db079e94a 100644
--- a/doc/doc.h
+++ b/doc/doc.h
@@ -7,5 +7,5 @@
 *
 * Some additional documentation can be found under [Files](files.html), in the src/include/ directory.
 *
- * See also the [handbooks](https://gnunet.org/handbooks) on installation, and for user and developer documentation.
+ * See also the [handbooks](https://docs.gnunet.org/) on installation, and for user and developer documentation.
 */
diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am
index 57a85bd56..a50a58937 100644
--- a/doc/handbook/Makefile.am
+++ b/doc/handbook/Makefile.am
@@ -18,7 +18,7 @@ infoimagedir = $(infodir)/images
 # we use the include version which is backwards compatible
 # and upwards compatible, while the ref variant is neither.
-AM_MAKEINFOHTMLFLAGS = --no-split --css-include=manual.css
+AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css
 dist_infoimage_DATA =                                           \
        images/gnunet-gtk-0-10-gns-a-done.png                   \
@@ -154,13 +154,6 @@ version.texi/replacement/revert:
        @echo "@set VERSION GPACKAGE_VERSION" > gversion.texi
        @echo "@set EDITION GPACKAGE_VERSION" >> gversion.texi
-if TEXI2MDOC_GENERATION
-gnunet-documentation.7: version.texi/replacement
-        @echo Attempting to output an mdoc formatted section 7 document
-        @texi2mdoc -I$(pwd):$(pwd)/chapters gnunet.texi > ../man/gnunet-documentation.7
-# TODO: (Maybe) other outputs resulting from this.
-endif
 # FIXME: rm *.html and *.pdf
 #doc-clean:
diff --git a/doc/handbook/chapters/developer.texi b/doc/handbook/chapters/developer.texi
index cd81fcfb7..6c426ebad 100644
--- a/doc/handbook/chapters/developer.texi
+++ b/doc/handbook/chapters/developer.texi
@@ -202,7 +202,8 @@ Gtk+-based user interfaces, including:
 @item @command{gnunet-statistics-gtk} (statistics over time),
 @item @command{gnunet-peerinfo-gtk}
 (information about current connections and known peers),
-@item @command{gnunet-chat-gtk} (chat GUI) and
+@item @command{gnunet-namestore-gtk} (GNS record editor),
+@item @command{gnunet-conversation-gtk} (voice chat GUI) and
 @item @command{gnunet-setup} (setup tool for "everything")
 @end itemize
@@ -2176,7 +2177,7 @@ work):
 @example
 export PYPI=@value{PYPI-URL}
 wget $PYPI/z/zope.interface/zope.interface-3.8.0.tar.gz
-tar zvfz zope.interface-3.8.0.tar.gz
+tar xzvf zope.interface-3.8.0.tar.gz
 cd zope.interface-3.8.0
 sudo python setup.py install
 @end example
@@ -2401,10 +2402,11 @@ the program at various levels.
 @file{gnunet_common.h} defines several @strong{log levels}:
 @table @asis
-@item ERROR for errors (really problematic situations, often leading to
+@item ERROR for errors
-crashes)
+(really problematic situations, often leading to crashes)
-@item WARNING for warnings (troubling situations that might have
+@item WARNING for warnings
-negative consequences, although not fatal)
+(troubling situations that might have negative consequences, although
+not fatal)
 @item INFO for various information.
 Used somewhat rarely, as GNUnet statistics is used to hold and display
 most of the information that users might find interesting.
@@ -2830,7 +2832,7 @@ which both ensure correct alignment when sending structs over the network.
 @c ***********************************************************************
 @node Client - Establish connection
 @subsubsection Client - Establish connection
-@c %**end of header
 At first, on the client side, the underlying API is employed to create a
@@ -2845,7 +2847,7 @@ client = GNUNET_CLIENT_connect ("transport", cfg);
 @c ***********************************************************************
 @node Client - Initialize request message
 @subsubsection Client - Initialize request message
-@c %**end of header
 When the connection is ready, we initialize the message. In this step,
 all the fields of the message should be properly initialized, namely the
@@ -2878,7 +2880,7 @@ Big Endian and Little Endian.
 @c ***********************************************************************
 @node Client - Send request and receive response
 @subsubsection Client - Send request and receive response
-@c %**end of header
 @b{FIXME: This is very outdated, see the tutorial for the current API!}
@@ -2913,7 +2915,7 @@ int main(int argc, char**argv) @{
 @c ***********************************************************************
 @node Server - Add new handles for specified messages
 @subsubsection Server - Add new handles for specified messages
-@c %**end of header
 in the function above the argument @code{run} is used to initiate
 transport service,and defined like this:
@@ -2971,7 +2973,7 @@ depicted as @code{@{NULL, NULL, 0, 0@}} is set in the last area.
 @c ***********************************************************************
 @node Server - Process request message
 @subsubsection Server - Process request message
-@c %**end of header
 After the initialization of transport service, the request message would
 be processed. Before handling the main message data, the validity of this
@@ -3022,7 +3024,7 @@ message.
 @c ***********************************************************************
 @node Server - Response to client
 @subsubsection Server - Response to client
-@c %**end of header
 Once the processing of current request is done, the server should give the
 response to the client. A new @code{struct AddressLookupMessage} would be
@@ -3058,7 +3060,7 @@ to send the message.
 @c ***********************************************************************
 @node Server - Notification of clients
 @subsubsection Server - Notification of clients
-@c %**end of header
 Often a service needs to (repeatedly) transmit notifications to a client
 or a group of clients. In these cases, the client typically has once
@@ -3087,7 +3089,7 @@ messages to the server.
 @node Conversion between Network Byte Order (Big Endian) and Host Byte Order
 @subsubsection Conversion between Network Byte Order (Big Endian) and Host Byte Order
 @c %** subsub? it's a referenced page on the ipc document.
-@c %**end of header
 Here we can simply comprehend big endian and little endian as Network Byte
 Order and Host Byte Order respectively. What is the difference between
@@ -3143,7 +3145,7 @@ byte order.
 @cindex Cryptography API
 @node Cryptography API
 @subsection Cryptography API
-@c %**end of header
 The gnunetutil APIs provides the cryptographic primitives used in GNUnet.
 GNUnet uses 2048 bit RSA keys for the session key exchange and for signing
@@ -3180,7 +3182,7 @@ should be considered secure for traditional applications of RSA.
 @cindex Message Queue API
 @node Message Queue API
 @subsection Message Queue API
-@c %**end of header
 @strong{ Introduction }@
 Often, applications need to queue messages that
@@ -3324,7 +3326,7 @@ callback. When canceling an envelope, it is not necessary@ to call
 @cindex Service API
 @node Service API
 @subsection Service API
-@c %**end of header
 Most GNUnet code lives in the form of services. Services are processes
 that offer an API for other components of the system to build on. Those
@@ -3400,7 +3402,7 @@ clients to set (possibly persistent) statistic values before terminating.
 @c ***********************************************************************
 @node Optimizing Memory Consumption of GNUnet's (Multi-) Hash Maps
 @subsection Optimizing Memory Consumption of GNUnet's (Multi-) Hash Maps
-@c %**end of header
 A commonly used data structure in GNUnet is a (multi-)hash map. It is most
 often used to map a peer identity to some data structure, but also to map
@@ -3424,7 +3426,7 @@ the hash map.
 @node Analysis
 @subsubsection Analysis
-@c %**end of header
 The main reason for the "excessive" memory consumption by the hash map is
 that GNUnet uses 512-bit cryptographic hash codes --- and the
@@ -3475,7 +3477,7 @@ we tend to really try to keep the entries small.
 @c ***********************************************************************
 @node Solution
 @subsubsection Solution
-@c %**end of header
 The solution that has now been implemented is to @strong{optionally}
 allow the hash map to not make a (deep) copy of the hash but instead have
@@ -3493,7 +3495,7 @@ pointer and undefined behavior of the (multi-)hash map API.
 @c ***********************************************************************
 @node Migration
 @subsubsection Migration
-@c %**end of header
 To use the new feature, first check that the values contain the respective
 key (and never modify it). Then, all calls to
@@ -3542,7 +3544,7 @@ removed from the map, undefined behavior is likely to be observed.
 @c ***********************************************************************
 @node Conclusion
 @subsubsection Conclusion
-@c %**end of header
 The new optimization can is often applicable and can result in a
 reduction in memory consumption of up to 30% in practice. However, it
@@ -3555,10 +3557,11 @@ at least until benchmarks exist).
 @c ***********************************************************************
 @node Availability
 @subsubsection Availability
-@c %**end of header
-The new multi hash map code was committed in SVN 24319 (will be in GNUnet
-0.9.4). Various subsystems (transport, core, dht, file-sharing) were
+The new multi hash map code was committed in SVN 24319 (which made its
+way into GNUnet version 0.9.4).
+Various subsystems (transport, core, dht, file-sharing) were
 previously audited and modified to take advantage of the new capability.
 In particular, memory consumption of the file-sharing service is expected
 to drop by 20-30% due to this change.
@@ -3567,7 +3570,7 @@ to drop by 20-30% due to this change.
 @cindex CONTAINER_MDLL API
 @node CONTAINER_MDLL API
 @subsection CONTAINER_MDLL API
-@c %**end of header
 This text documents the GNUNET_CONTAINER_MDLL API. The
 GNUNET_CONTAINER_MDLL API is similar to the GNUNET_CONTAINER_DLL API in
@@ -3633,7 +3636,7 @@ Iterating over the list should be done by directly accessing the
 @cindex ARM
 @node Automatic Restart Manager (ARM)
 @section Automatic Restart Manager (ARM)
-@c %**end of header
 GNUnet's Automated Restart Manager (ARM) is the GNUnet service responsible
 for system initialization and service babysitting. ARM starts and halts
@@ -3654,7 +3657,7 @@ about how ARM works and how to interact with it.
 @c ***********************************************************************
 @node Basic functionality
 @subsection Basic functionality
-@c %**end of header
 @itemize @bullet
 @item ARM source code can be found under "src/arm".@ Service processes are
@@ -3678,7 +3681,7 @@ it to start a service "resolver", stops the "resolver" then stops "ARM".
 @c ***********************************************************************
 @node Key configuration options
 @subsection Key configuration options
-@c %**end of header
 Configurations for ARM and services should be available in a .conf file
 (As an example, see test_arm_api_data.conf). When running ARM, the
@@ -3747,7 +3750,7 @@ services that are going to run.
 @c ***********************************************************************
 @node ARM - Availability
 @subsection ARM - Availability
-@c %**end of header
 As mentioned before, one of the features provided by ARM is starting
 services on demand. Consider the example of one service "client" that
@@ -3835,7 +3838,7 @@ problematic service.
 @cindex TRANSPORT Subsystem
 @node TRANSPORT Subsystem
 @section TRANSPORT Subsystem
-@c %**end of header
 This chapter documents how the GNUnet transport subsystem works. The
 GNUnet transport subsystem consists of three main components: the
@@ -3893,7 +3896,7 @@ transport service.
 @node Address validation protocol
 @subsection Address validation protocol
-@c %**end of header
 This section documents how the GNUnet transport service validates
 connections with other peers. It is a high-level description of the
@@ -3956,7 +3959,7 @@ implementation details).
 @cindex NAT library
 @node NAT library
 @section NAT library
-@c %**end of header
 The goal of the GNUnet NAT library is to provide a general-purpose API for
 NAT traversal @strong{without} third-party support. So protocols that
@@ -4003,7 +4006,7 @@ This way, it is easy to test if the current NAT configuration is valid.
 @node Distance-Vector plugin
 @section Distance-Vector plugin
-@c %**end of header
 The Distance Vector (DV) transport is a transport mechanism that allows
 peers to act as relays for each other, thereby connecting peers that would
@@ -4072,7 +4075,8 @@ message, and delivers it to Carol as though it came directly from Alice.
 @cindex SMTP plugin
 @node SMTP plugin
 @section SMTP plugin
-@c %**end of header
+@c TODO: Update!
 This section describes the new SMTP transport plugin for GNUnet as it
 exists in the 0.7.x and 0.8.x branch. SMTP support is currently not
@@ -4080,6 +4084,9 @@ available in GNUnet 0.9.x. This page also describes the transport layer
 abstraction (as it existed in 0.7.x and 0.8.x) in more detail and gives
 some benchmarking results. The performance results presented are quite
 old and maybe outdated at this point.
+For the readers in the year 2019, you will notice by the mention of
+version 0.7, 0.8, and 0.9 that this section has to be taken with your
+usual grain of salt and be updated eventually.
 @itemize @bullet
 @item Why use SMTP for a peer-to-peer transport?
@@ -4101,7 +4108,7 @@ old and maybe outdated at this point.
 @node Why use SMTP for a peer-to-peer transport?
 @subsection Why use SMTP for a peer-to-peer transport?
-@c %**end of header
 There are many reasons why one would not want to use SMTP:
@@ -4136,7 +4143,7 @@ type of situation.
 @node How does it work?
 @subsection How does it work?
-@c %**end of header
 When a GNUnet peer needs to send a message to another GNUnet peer that has
 advertised (only) an SMTP transport address, GNUnet base64-encodes the
@@ -4149,7 +4156,7 @@ GNUnet E-mail messages by searching for a generic filter.
 @node How do I configure my peer?
 @subsection How do I configure my peer?
-@c %**end of header
 First, you need to configure @code{procmail} to filter your inbound E-mail
 for GNUnet traffic. The GNUnet messages must be delivered into a pipe, for
@@ -4194,7 +4201,7 @@ This should be it, but you may probably want to test it first.
 @node How do I test if it works?
 @subsection How do I test if it works?
-@c %**end of header
 Any transport can be subjected to some rudimentary tests using the
 @code{gnunet-transport-check} tool. The tool sends a message to the local
@@ -4217,7 +4224,7 @@ to send and receive messages.
 @node How fast is it?
 @subsection How fast is it?
-@c %**end of header
 We have measured the performance of the UDP, TCP and SMTP transport layer
 directly and when used from an application using the GNUnet core.
@@ -4284,7 +4291,7 @@ benchmarking results.
 @cindex Bluetooth plugin
 @node Bluetooth plugin
 @section Bluetooth plugin
-@c %**end of header
 This page describes the new Bluetooth transport plugin for GNUnet. The
 plugin is still in the testing stage so don't expect it to work
@@ -4310,7 +4317,7 @@ ask on the IRC channel.
 @node What do I need to use the Bluetooth plugin transport?
 @subsection What do I need to use the Bluetooth plugin transport?
-@c %**end of header
 If you are a GNU/Linux user and you want to use the Bluetooth
 transport plugin you should install the
@@ -4337,7 +4344,7 @@ protocol so we cannot turn on your device programatically!
 @c FIXME: Change to unique title
 @node How does it work2?
 @subsection How does it work2?
-@c %**end of header
 The Bluetooth transport plugin uses virtually the same code as the WLAN
 plugin and only the helper binary is different. The helper takes a single
@@ -4367,7 +4374,7 @@ discovery.
 @node What possible errors should I be aware of?
 @subsection What possible errors should I be aware of?
-@c %**end of header
 @emph{This section is dedicated for GNU/Linux users}
@@ -4406,7 +4413,7 @@ the device and to send some particular commands to it.
 @c FIXME: A more unique name
 @node How do I configure my peer2?
 @subsection How do I configure my peer2?
-@c %**end of header
 On GNU/Linux, you just have to be sure that the interface name
 corresponds to the one that you want to use.
@@ -4440,7 +4447,7 @@ transport service.
 @node How can I test it?
 @subsection How can I test it?
-@c %**end of header
 If you have two Bluetooth devices on the same machine and you are using
 GNU/Linux you must:
@@ -4487,7 +4494,7 @@ transport service.
 @node The implementation of the Bluetooth transport plugin
 @subsection The implementation of the Bluetooth transport plugin
-@c %**end of header
 This page describes the implementation of the Bluetooth transport plugin.
@@ -4521,7 +4528,7 @@ platforms.
 @node Linux functionality
 @subsubsection Linux functionality
-@c %**end of header
 In order to implement the plugin functionality on GNU/Linux I
 used the BlueZ stack.
@@ -4617,7 +4624,7 @@ support for @strong{broadcast messages}.}
 @node Details about the broadcast implementation
 @subsubsection Details about the broadcast implementation
-@c %**end of header
 First I want to point out that the broadcast functionality for the CONTROL
 messages is not implemented in a conventional way. Since the inquiry scan
@@ -4664,7 +4671,7 @@ simply use the socket.
 @node Windows functionality
 @subsubsection Windows functionality
-@c %**end of header
 For Windows I decided to use the Microsoft Bluetooth stack which has the
 advantage of coming standard from Windows XP SP2. The main disadvantage is
@@ -4719,7 +4726,7 @@ broadcast messages. When it receives a broadcast message it will skip it.
 @node Pending features
 @subsubsection Pending features
-@c %**end of header
 @itemize @bullet
 @item Implement the broadcast functionality on Windows @emph{(currently
@@ -4735,7 +4742,7 @@ contact me.
 @node WLAN plugin
 @section WLAN plugin
-@c %**end of header
 This section documents how the wlan transport plugin works. Parts which
 are not implemented yet or could be better implemented are described at
@@ -4744,7 +4751,7 @@ the end.
 @cindex ATS Subsystem
 @node ATS Subsystem
 @section ATS Subsystem
-@c %**end of header
 ATS stands for "automatic transport selection", and the function of ATS in
 GNUnet is to decide on which address (and thus transport plugin) should
@@ -4767,7 +4774,7 @@ superior.
 @cindex CORE Subsystem
 @node CORE Subsystem
 @section CORE Subsystem
-@c %**end of header
 The CORE subsystem in GNUnet is responsible for securing link-layer
 communications between nodes in the GNUnet overlay network. CORE builds
@@ -4811,7 +4818,7 @@ message counters and ephemeral keys)
 @cindex core subsystem limitations
 @node Limitations
 @subsection Limitations
-@c %**end of header
 CORE does not perform
 @uref{http://en.wikipedia.org/wiki/Routing, routing}; using CORE it is
@@ -4845,7 +4852,7 @@ control is needed, applications should use the CADET service.
 @cindex when is a peer connected
 @node When is a peer "connected"?
 @subsection When is a peer "connected"?
-@c %**end of header
 In addition to the security features mentioned above, CORE also provides
 one additional key feature to applications using it, and that is a
@@ -4878,7 +4885,7 @@ connection.
 @cindex libgnunetcore
 @node libgnunetcore
 @subsection libgnunetcore
-@c %**end of header
 The CORE API (defined in @file{gnunet_core_service.h}) is the basic
 messaging API used by P2P applications built using GNUnet. It provides
@@ -4943,7 +4950,7 @@ re-established, the applications will be receive matching connect events.
 @cindex core clinet-service protocol
 @node The CORE Client-Service Protocol
 @subsection The CORE Client-Service Protocol
-@c %**end of header
 This section describes the protocol between an application using the CORE
 service (the client) and the CORE service process itself.
@@ -4957,7 +4964,7 @@ service (the client) and the CORE service process itself.
 @node Setup2
 @subsubsection Setup2
-@c %**end of header
 When a client connects to the CORE service, it first sends a
 @code{InitMessage} which specifies options for the connection and a set of
@@ -4986,7 +4993,7 @@ both CORE and the client can send messages.
 @node Notifications
 @subsubsection Notifications
-@c %**end of header
 The CORE will send @code{ConnectNotifyMessage}s and
 @code{DisconnectNotifyMessage}s whenever peers connect or disconnect from
@@ -5002,7 +5009,7 @@ identity given is that of the receiver.
 @node Sending
 @subsubsection Sending
-@c %**end of header
 When a client wants to transmit a message, it first requests a
 transmission slot by sending a @code{SendMessageRequest} which specifies
@@ -5022,7 +5029,7 @@ for each request).
 @cindex CORE Peer-to-Peer Protocol
 @node The CORE Peer-to-Peer Protocol
 @subsection The CORE Peer-to-Peer Protocol
-@c %**end of header
 @menu
@@ -5035,7 +5042,7 @@ for each request).
 @cindex EphemeralKeyMessage creation
 @node Creating the EphemeralKeyMessage
 @subsubsection Creating the EphemeralKeyMessage
-@c %**end of header
 When the CORE service starts, each peer creates a fresh ephemeral (ECC)
 public-private key pair and signs the corresponding
@@ -5076,7 +5083,7 @@ connection using the new ephemeral key
 @node Establishing a connection
 @subsubsection Establishing a connection
-@c %**end of header
 Peers begin their interaction by sending a @code{EphemeralKeyMessage} to
 the other peer once the TRANSPORT service notifies the CORE service about
@@ -5094,7 +5101,7 @@ connection to @code{KX_STATE_UP}.
 @node Encryption and Decryption
 @subsubsection Encryption and Decryption
-@c %**end of header
 All functions related to the key exchange and encryption/decryption of
 messages can be found in @file{gnunet-service-core_kx.c} (except for the
@@ -5122,7 +5129,7 @@ older than 12 hours.
 @node Type maps
 @subsubsection Type maps
-@c %**end of header
 Once an encrypted connection has been established, peers begin to exchange
 type maps. Type maps are used to allow the CORE service to determine which
@@ -5155,6 +5162,8 @@ receiving a type map by sending back a
 retransmit the type map (with exponential back-off).
 @cindex CADET Subsystem
+@cindex CADET
+@cindex cadet
 @node CADET Subsystem
 @section CADET Subsystem
@@ -5221,6 +5230,7 @@ Should a message get lost on TRANSPORT/CORE level, if a channel is
 created with as reliable, CADET will retransmit the lost message and
 deliver it in order to the destination application.
+@pindex GNUNET_CADET_connect
 To communicate with other peers using CADET, it is necessary to first
 connect to the service using @code{GNUNET_CADET_connect}.
 This function takes several parameters in form of callbacks, to allow the
@@ -5232,7 +5242,8 @@ CADET, even do one connection per listening port).
 The function returns a handle which has to be used for any further
 interaction with the service.
-To connect to a remote peer a client has to call the
+@pindex GNUNET_CADET_channel_create
+To connect to a remote peer, a client has to call the
 @code{GNUNET_CADET_channel_create} function. The most important parameters
 given are the remote peer's identity (it public key) and a port, which
 specifies which application on the remote peer to connect to, similar to
@@ -5242,6 +5253,7 @@ exchanges to assure and authenticated, secure and verified communication.
 Similar to @code{GNUNET_CADET_connect},@code{GNUNET_CADET_create_channel}
 returns a handle to interact with the created channel.
+@pindex GNUNET_CADET_notify_transmit_ready
 For every message the client wants to send to the remote application,
 @code{GNUNET_CADET_notify_transmit_ready} must be called, indicating the
 channel on which the message should be sent and the size of the message
@@ -5258,6 +5270,7 @@ case. To be alerted when a channel is online, a client can call
 means that the channel is online. The callback can give 0 bytes to CADET
 if no message is to be sent, this is OK.
+@pindex GNUNET_CADET_notify_transmit_cancel
 If a transmission was requested but before the callback fires it is no
 longer needed, it can be canceled with
 @code{GNUNET_CADET_notify_transmit_ready_cancel}, which uses the handle
@@ -5266,6 +5279,7 @@ As in the case of CORE, only one message can be requested at a time: a
 client must not call @code{GNUNET_CADET_notify_transmit_ready} again until
 the callback is called or the request is canceled.
+@pindex GNUNET_CADET_channel_destroy
 When a channel is no longer needed, a client can call
 @code{GNUNET_CADET_channel_destroy} to get rid of it.
 Note that CADET will try to transmit all pending traffic before notifying
@@ -5277,6 +5291,7 @@ on any incoming or outgoing channels are given to the client when CADET
 executes the callbacks given to it at the time of
 @code{GNUNET_CADET_connect}.
+@pindex GNUNET_CADET_disconnect
 Finally, when an application no longer wants to use CADET, it should call
 @code{GNUNET_CADET_disconnect}, but first all channels and pending
 transmissions must be closed (otherwise CADET will complain).
@@ -5394,7 +5409,7 @@ to all the other peers, who will calculate the estimate from it.
 @node Target value
 @subsubsection Target value
-@c %**end of header
 The target value itself is generated by hashing the current time, rounded
 down to an agreed value. If the rounding amount is 1h (default) and the
@@ -5404,7 +5419,7 @@ Every repetition is called a round.
 @node Timing
 @subsubsection Timing
-@c %**end of header
 The NSE subsystem has some timing control to avoid everybody broadcasting
 its ID all at one. Once each peer has the target random value, it
@@ -5421,7 +5436,7 @@ peers closest to the target value start broadcasting their ID the first.
 @node Controlled Flooding
 @subsubsection Controlled Flooding
-@c %**end of header
 When a peer receives a value, first it verifies that it is closer than the
 closest value it had so far, otherwise it answers the incoming message
@@ -5440,7 +5455,7 @@ to the neighbors.
 @node Calculating the estimate
 @subsubsection Calculating the estimate
-@c %**end of header
 Once the closest ID has been spread across the network each peer gets the
 exact distance between this ID and the target value of the round and
@@ -5459,7 +5474,7 @@ means a factor of two in the size estimate.
 @node libgnunetnse
 @subsection libgnunetnse
-@c %**end of header
 The NSE subsystem has the simplest API of all services, with only two
 calls: @code{GNUNET_NSE_connect} and @code{GNUNET_NSE_disconnect}.
@@ -5485,7 +5500,7 @@ is no longer called with new estimates.
 @node Results
 @subsubsection Results
-@c %**end of header
 The callback provides two values: the average and the
 @uref{http://en.wikipedia.org/wiki/Standard_deviation, standard deviation}
@@ -5523,7 +5538,7 @@ changing rapidly).
 @node libgnunetnse - Examples
 @subsubsection libgnunetnse -Examples
-@c %**end of header
 Let's close with a couple examples.
@@ -5550,7 +5565,7 @@ case a 5 sigma minimum would be 2 million and a 6 sigma minimum,
 @node The NSE Client-Service Protocol
 @subsection The NSE Client-Service Protocol
-@c %**end of header
 As with the API, the client-service protocol is very simple, only has 2
 different messages, defined in @code{src/nse/nse.h}:
@@ -5571,8 +5586,8 @@ simply disconnects from the service, with no message involved.
 @node The NSE Peer-to-Peer Protocol
 @subsection The NSE Peer-to-Peer Protocol
-@c %**end of header
+@pindex GNUNET_MESSAGE_TYPE_NSE_P2P_FLOOD
 The NSE subsystem only has one message in the P2P protocol, the
 @code{GNUNET_MESSAGE_TYPE_NSE_P2P_FLOOD} message.
@@ -5626,7 +5641,7 @@ traffic spikes and minimize cross-messages.
 @node HOSTLIST Subsystem
 @section HOSTLIST Subsystem
-@c %**end of header
 Peers in the GNUnet overlay network need address information so that they
 can connect with other peers. GNUnet uses so called HELLO messages to
@@ -5664,7 +5679,7 @@ manual effort or the use of a HOSTLIST to obtain HELLOs.
 @node HELLOs
 @subsection HELLOs
-@c %**end of header
 The basic information peers require to connect to other peers are
 contained in so called HELLO messages you can think of as a business card.
@@ -5676,7 +5691,7 @@ contact other peers.
 @node Overview for the HOSTLIST subsystem
 @subsection Overview for the HOSTLIST subsystem
-@c %**end of header
 The HOSTLIST subsystem provides a way to distribute and obtain contact
 information to connect to other peers using a simple HTTP GET request.
@@ -5702,7 +5717,7 @@ service.
 @node Features
 @subsubsection Features
-@c %**end of header
 The HOSTLIST daemon can:
@@ -5720,7 +5735,7 @@ peers
 @node HOSTLIST - Limitations
 @subsubsection HOSTLIST - Limitations
-@c %**end of header
 The HOSTLIST daemon does not:
@@ -5732,7 +5747,7 @@ The HOSTLIST daemon does not:
 @node Interacting with the HOSTLIST daemon
 @subsection Interacting with the HOSTLIST daemon
-@c %**end of header
 The HOSTLIST subsystem is currently implemented as a daemon, so there is
 no need for the user to interact with it and therefore there is no
@@ -5760,7 +5775,7 @@ download frequency).
 @node Hostlist security address validation
 @subsection Hostlist security address validation
-@c %**end of header
 Since information obtained from other parties cannot be trusted without
 validation, we have to distinguish between @emph{validated} and
@@ -5781,12 +5796,13 @@ to the TRANSPORT server to validate the addresses.
 @node The HOSTLIST daemon
 @subsection The HOSTLIST daemon
-@c %**end of header
 The hostlist daemon is the main component of the HOSTLIST subsystem. It is
 started by the ARM service and (if configured) starts the HOSTLIST client
 and server components.
+@pindex GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT
 If the daemon provides a hostlist itself it can advertise it's own
 hostlist to other peers. To do so it sends a
 @code{GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT} message to other peers
@@ -5811,7 +5827,7 @@ subsystems and disconnecting from CORE.
 @node The HOSTLIST server
 @subsection The HOSTLIST server
-@c %**end of header
 The server provides a way for other peers to obtain HELLOs. Basically it
 is a small web server other peers can connect to and download a list of
@@ -5827,7 +5843,7 @@ to other peers connecting on CORE level.
 @node The HTTP Server
 @subsubsection The HTTP Server
-@c %**end of header
 During startup, the server starts a web server listening on the port
 specified with the HTTPPORT value (default 8080). In addition it connects
@@ -5853,7 +5869,7 @@ The connection will be closed immediately if no hostlist is available.
 @node Advertising the URL
 @subsubsection Advertising the URL
-@c %**end of header
 The server also advertises the URL to download the hostlist to other peers
 if hostlist advertisement is enabled.
@@ -5865,7 +5881,7 @@ peer using the CORE service.
 @node The HOSTLIST client
 @subsection The HOSTLIST client
-@c %**end of header
 The client provides the functionality to download the list of HELLOs from
 a set of URLs.
@@ -5889,7 +5905,7 @@ The client supports two modes of operation:
 @node Bootstrapping
 @subsubsection Bootstrapping
-@c %**end of header
 For bootstrapping, it schedules a task to download the hostlist from the
 set of known URLs.
@@ -5918,7 +5934,7 @@ quality of this URL is updated.
 @node Learning
 @subsubsection Learning
-@c %**end of header
 The client also manages hostlist advertisements from other peers. The
 HOSTLIST daemon forwards @code{GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT}
@@ -5937,7 +5953,7 @@ never discarded.
 @node Usage
 @subsection Usage
-@c %**end of header
 To start HOSTLIST by default, it has to be added to the DEFAULTSERVICES
 section for the ARM services. This is done in the default configuration.
@@ -5951,7 +5967,7 @@ Configuring your peer to provide a hostlist
 @node IDENTITY Subsystem
 @section IDENTITY Subsystem
-@c %**end of header
 Identities of "users" in GNUnet are called egos.
 Egos can be used as pseudonyms ("fake names") or be tied to an
@@ -6007,7 +6023,7 @@ between anonymous and pseudonymous egos.
 @cindex libgnunetidentity
 @node libgnunetidentity
 @subsection libgnunetidentity
-@c %**end of header
 @menu
@@ -6021,7 +6037,7 @@ between anonymous and pseudonymous egos.
 @node Connecting to the service
 @subsubsection Connecting to the service
-@c %**end of header
 First, typical clients connect to the identity service using
 @code{GNUNET_IDENTITY_connect}. This function takes a callback as a
@@ -6057,7 +6073,7 @@ ego's handle.
 @node Operations on Egos
 @subsubsection Operations on Egos
-@c %**end of header
 Given an ego handle, the main operations are to get its associated private
 key using @code{GNUNET_IDENTITY_ego_get_private_key} or its associated
@@ -6080,7 +6096,7 @@ only the continuation will no longer be called.
 @node The anonymous Ego
 @subsubsection The anonymous Ego
-@c %**end of header
 A special way to obtain an ego handle is to call
 @code{GNUNET_IDENTITY_ego_get_anonymous}, which returns an ego for the
@@ -6115,7 +6131,7 @@ using @code{GNUNET_IDENTITY_get}.
 @node The IDENTITY Client-Service Protocol
 @subsection The IDENTITY Client-Service Protocol
-@c %**end of header
 A client connecting to the identity service first sends a message with
 type
@@ -6206,7 +6222,7 @@ private key.}
 @node Editing Zone Information
 @subsubsection Editing Zone Information
-@c %**end of header
 NAMESTORE provides functions to lookup records stored under a label in a
 zone and to store records under a label in a zone.
@@ -6246,7 +6262,7 @@ the operation.
 @node Iterating Zone Information
 @subsubsection Iterating Zone Information
-@c %**end of header
 A client can iterate over all information in a zone or all zones managed
 by NAMESTORE.
@@ -6266,7 +6282,7 @@ NULL value to indicate.
 @node Monitoring Zone Information
 @subsubsection Monitoring Zone Information
-@c %**end of header
 Clients can also monitor zones to be notified about changes. Here the
 clients uses the @code{GNUNET_NAMESTORE_zone_monitor_start} function and
@@ -6287,7 +6303,7 @@ from the function to start the monitoring.
 @node PEERINFO Subsystem
 @section PEERINFO Subsystem
-@c %**end of header
 The PEERINFO subsystem is used to store verified (validated) information
 about known peers in a persistent way. It obtains these addresses for
@@ -6320,7 +6336,7 @@ service providing this functionality.
 @node PEERINFO - Features
 @subsection PEERINFO - Features
-@c %**end of header
 @itemize @bullet
 @item Persistent storage
@@ -6340,7 +6356,7 @@ service providing this functionality.
 @node DeveloperPeer Information
 @subsection DeveloperPeer Information
-@c %**end of header
 The PEERINFO subsystem stores these information in the form of HELLO
 messages you can think of as business cards.
@@ -6374,7 +6390,7 @@ subsystem using these information to maintain connections to other peers.
 @node Startup
 @subsection Startup
-@c %**end of header
 During startup the PEERINFO services loads persistent HELLOs from disk.
 First PEERINFO parses the directory configured in the HOSTS value of the
@@ -6390,7 +6406,7 @@ The use of these HELLOs can be prevented by setting the
 @node Managing Information
 @subsection Managing Information
-@c %**end of header
 The PEERINFO services stores information about known PEERS and a single
 HELLO message for every peer.
@@ -6412,7 +6428,7 @@ from the disk.
 @node Obtaining Information
 @subsection Obtaining Information
-@c %**end of header
 When a client requests information from PEERINFO, PEERINFO performs a
 lookup for the respective peer or all peers if desired and transmits this
@@ -6429,7 +6445,7 @@ merge for example) or a new peer was added.
 @node The PEERINFO Client-Service Protocol
 @subsection The PEERINFO Client-Service Protocol
-@c %**end of header
 To connect and disconnect to and from the PEERINFO Service PEERINFO
 utilizes the util client/server infrastructure, so no special messages
@@ -6461,7 +6477,7 @@ message, it can proceed with the next request if any is pending.
 @node libgnunetpeerinfo
 @subsection libgnunetpeerinfo
-@c %**end of header
 The PEERINFO API consists mainly of three different functionalities:
@@ -6480,7 +6496,7 @@ The PEERINFO API consists mainly of three different functionalities:
 @node Connecting to the PEERINFO Service
 @subsubsection Connecting to the PEERINFO Service
-@c %**end of header
 To connect to the PEERINFO service the function
 @code{GNUNET_PEERINFO_connect} is used, taking a configuration handle as
@@ -6491,7 +6507,7 @@ handle returned from the connect function has to be called.
 @node Adding Information to the PEERINFO Service
 @subsubsection Adding Information to the PEERINFO Service
-@c %**end of header
 @code{GNUNET_PEERINFO_add_peer} adds a new peer to the PEERINFO subsystem
 storage. This function takes the PEERINFO handle as an argument, the HELLO
@@ -6506,7 +6522,7 @@ can tell PEERINFO to notify if new peer information are available.
 @node Obtaining Information from the PEERINFO Service
 @subsubsection Obtaining Information from the PEERINFO Service
-@c %**end of header
 To iterate over information in PEERINFO you use
 @code{GNUNET_PEERINFO_iterate}.
@@ -6531,7 +6547,7 @@ with @code{GNUNET_PEERINFO_notify_cancel}.
 @node PEERSTORE Subsystem
 @section PEERSTORE Subsystem
-@c %**end of header
 GNUnet's PEERSTORE subsystem offers persistent per-peer storage for other
 GNUnet subsystems. GNUnet subsystems can use PEERSTORE to persistently
@@ -6555,7 +6571,7 @@ Each data record stored with PEERSTORE contains the following fields:
 @node Functionality
 @subsection Functionality
-@c %**end of header
 Subsystems can store any type of value under a (subsystem, peerid, key)
 combination. A "replace" flag set during store operations forces the
@@ -6581,7 +6597,7 @@ request to PEERSTORE.
 @node Architecture
 @subsection Architecture
-@c %**end of header
 PEERSTORE implements the following components:
@@ -6597,7 +6613,7 @@ only an "sqlite" plugin is implemented.
 @node libgnunetpeerstore
 @subsection libgnunetpeerstore
-@c %**end of header
 libgnunetpeerstore is the library containing the PEERSTORE API. Subsystems
 wishing to communicate with the PEERSTORE service use this API to open a
@@ -6645,7 +6661,7 @@ destroyed as well.
 @node SET Subsystem
 @section SET Subsystem
-@c %**end of header
 The SET service implements efficient set operations between two peers
 over a mesh tunnel.
@@ -6668,7 +6684,7 @@ The size of an element's data is limited to around 62 KB.
 @node Local Sets
 @subsection Local Sets
-@c %**end of header
 Sets created by a local client can be modified and reused for multiple
 operations. As each set operation requires potentially expensive special
@@ -6682,7 +6698,7 @@ type.
 @node Set Modifications
 @subsection Set Modifications
-@c %**end of header
 Even when set operations are active, one can add to and remove elements
 from a set.
@@ -6695,7 +6711,7 @@ attaching @emph{generation information} to each element and operation.
 @node Set Operations
 @subsection Set Operations
-@c %**end of header
 Set operations can be started in two ways: Either by accepting an
 operation request from a remote peer, or by requesting a set operation
@@ -6712,7 +6728,7 @@ request (providing a local set for the operation) or reject it.
 @node Result Elements
 @subsection Result Elements
-@c %**end of header
 The SET service has three @emph{result modes} that determine how an
 operation's result set is delivered to the client:
@@ -6737,7 +6753,7 @@ actually interested in the result of the set operation.
 @node libgnunetset
 @subsection libgnunetset
-@c %**end of header
 @menu
 * Sets::
@@ -6750,7 +6766,7 @@ actually interested in the result of the set operation.
 @node Sets
 @subsubsection Sets
-@c %**end of header
 New sets are created with @code{GNUNET_SET_create}. Both the local peer's
 configuration (as each set has its own client connection) and the
@@ -6766,7 +6782,7 @@ Elements are added and removed with @code{GNUNET_SET_add_element} and
 @node Listeners
 @subsubsection Listeners
-@c %**end of header
 Listeners are created with @code{GNUNET_SET_listen}. Each time time a
 remote peer suggests a set operation with an application id and operation
@@ -6779,7 +6795,7 @@ until the client calls @code{GNUNET_SET_commit}
 @node Operations
 @subsubsection Operations
-@c %**end of header
 Operations to be initiated by the local peer are created with
 @code{GNUNET_SET_prepare}. Note that the operation will not be started
@@ -6789,7 +6805,7 @@ until the client calls @code{GNUNET_SET_commit}
 @node Supplying a Set
 @subsubsection Supplying a Set
-@c %**end of header
 To create symmetry between the two ways of starting a set operation
 (accepting and initiating it), the operation handles returned by
@@ -6803,7 +6819,7 @@ operation.
 @node The Result Callback
 @subsubsection The Result Callback
-@c %**end of header
 Clients must specify both a result mode and a result callback with
 @code{GNUNET_SET_accept} and @code{GNUNET_SET_prepare}. The result
@@ -6817,7 +6833,7 @@ or if it is in the difference between the original set and the final set.
 @node The SET Client-Service Protocol
 @subsection The SET Client-Service Protocol
-@c %**end of header
 @menu
 * Creating Sets::
@@ -6831,7 +6847,7 @@ or if it is in the difference between the original set and the final set.
 @node Creating Sets
 @subsubsection Creating Sets
-@c %**end of header
 For each set of a client, there exists a client connection to the service.
 Sets are created by sending the @code{GNUNET_SERVICE_SET_CREATE} message
@@ -6842,7 +6858,7 @@ the client.
 @node Listeners2
 @subsubsection Listeners2
-@c %**end of header
 Each listener also requires a seperate client connection. By sending the
 @code{GNUNET_SERVICE_SET_LISTEN} message, the client notifies the service
@@ -6856,7 +6872,7 @@ is supplied for the set operation.
 @node Initiating Operations
 @subsubsection Initiating Operations
-@c %**end of header
 Operations with remote peers are initiated by sending a
 @code{GNUNET_SERVICE_SET_EVALUATE} message to the service. The@ client
@@ -6865,7 +6881,7 @@ connection that this message is sent by determines the set to use.
 @node Modifying Sets
 @subsubsection Modifying Sets
-@c %**end of header
 Sets are modified with the @code{GNUNET_SERVICE_SET_ADD} and
 @code{GNUNET_SERVICE_SET_REMOVE} messages.
@@ -6878,7 +6894,7 @@ Sets are modified with the @code{GNUNET_SERVICE_SET_ADD} and
 @node Results and Operation Status
 @subsubsection Results and Operation Status
-@c %**end of header
 The service notifies the client of result elements and success/failure of
 a set operation with the @code{GNUNET_SERVICE_SET_RESULT} message.
@@ -6886,7 +6902,7 @@ a set operation with the @code{GNUNET_SERVICE_SET_RESULT} message.
 @node Iterating Sets
 @subsubsection Iterating Sets
-@c %**end of header
 All elements of a set can be requested by sending
 @code{GNUNET_SERVICE_SET_ITER_REQUEST}. The server responds with
@@ -6899,7 +6915,7 @@ iteration may be active for a set at any given time.
 @node The SET Intersection Peer-to-Peer Protocol
 @subsection The SET Intersection Peer-to-Peer Protocol
-@c %**end of header
 The intersection protocol operates over CADET and starts with a
 GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST being sent by the peer
@@ -6931,7 +6947,7 @@ just the initial handshake.
 @node The Bloom filter exchange
 @subsubsection The Bloom filter exchange
-@c %**end of header
 In this phase, each peer transmits a Bloom filter over the remaining
 keys of the local set to the other peer using a
@@ -6958,7 +6974,7 @@ this time as the sender.
 @node Salt
 @subsubsection Salt
-@c %**end of header
 Bloomfilter operations are probabilistic: With some non-zero probability
 the test may incorrectly say an element is in the set, even though it is
@@ -6978,7 +6994,7 @@ sets of the same size, and where the XOR over all keys computes the same
 @node The SET Union Peer-to-Peer Protocol
 @subsection The SET Union Peer-to-Peer Protocol
-@c %**end of header
 The SET union protocol is based on Eppstein's efficient set reconciliation
 without prior context. You should read this paper first if you want to
@@ -7021,7 +7037,7 @@ succeeding if they failed due to collisions before.
 @node STATISTICS Subsystem
 @section STATISTICS Subsystem
-@c %**end of header
 In GNUnet, the STATISTICS subsystem offers a central place for all
 subsystems to publish unsigned 64-bit integer run-time statistics.
@@ -7073,7 +7089,7 @@ to STATISTICS during shutdown.
 @node libgnunetstatistics
 @subsection libgnunetstatistics
-@c %**end of header
 @strong{libgnunetstatistics} is the library containing the API for the
 STATISTICS subsystem. Any process requiring to use STATISTICS should use
@@ -7104,7 +7120,7 @@ functions from the API can be used.
 @node Statistics retrieval
 @subsubsection Statistics retrieval
-@c %**end of header
 Once a connection to the statistics service is obtained, information
 about any other system which uses statistics can be retrieved with the
@@ -7127,7 +7143,7 @@ when we want to shutdown and cleanup everything.
 @node Setting statistics and updating them
 @subsubsection Setting statistics and updating them
-@c %**end of header
 So far we have seen how to retrieve statistics, here we will learn how we
 can set statistics and update them so that other subsystems can retrieve
@@ -7157,7 +7173,7 @@ to worry about sending requests too quickly.
 @node Watches
 @subsubsection Watches
-@c %**end of header
 As interesting feature of STATISTICS lies in serving notifications
 whenever a statistic of our interest is modified.
@@ -7177,7 +7193,7 @@ parameters that are used for registering the watch.
 @node The STATISTICS Client-Service Protocol
 @subsection The STATISTICS Client-Service Protocol
-@c %**end of header
 @menu
@@ -7189,7 +7205,7 @@ parameters that are used for registering the watch.
 @node Statistics retrieval2
 @subsubsection Statistics retrieval2
-@c %**end of header
 To retrieve statistics, the client transmits a message of type
 @code{GNUNET_MESSAGE_TYPE_STATISTICS_GET} containing the given subsystem
@@ -7203,7 +7219,7 @@ type @code{GNUNET_MESSAGE_TYPE_STATISTICS_END}.
 @node Setting and updating statistics
 @subsubsection Setting and updating statistics
-@c %**end of header
 The subsystem name, parameter name, its value and the persistence flag are
 communicated to the service through the message
@@ -7226,7 +7242,7 @@ the message should be treated as an update value.
 @node Watching for updates
 @subsubsection Watching for updates
-@c %**end of header
 The function registers the watch at the service by sending a message of
 type @code{GNUNET_MESSAGE_TYPE_STATISTICS_WATCH}. The service then sends
@@ -7239,7 +7255,7 @@ parameter's value is changed.
 @node Distributed Hash Table (DHT)
 @section Distributed Hash Table (DHT)
-@c %**end of header
 GNUnet includes a generic distributed hash table that can be used by
 developers building P2P applications in the framework.
@@ -7285,7 +7301,7 @@ loss of performance or quality of service is expected in this case).
 @node Block library and plugins
 @subsection Block library and plugins
-@c %**end of header
 @menu
 * What is a Block?::
@@ -7298,7 +7314,7 @@ loss of performance or quality of service is expected in this case).
 @node What is a Block?
 @subsubsection What is a Block?
-@c %**end of header
 Blocks are small (< 63k) pieces of data stored under a key (struct
 GNUNET_HashCode). Blocks have a type (enum GNUNET_BlockType) which defines
@@ -7315,7 +7331,7 @@ available for any type of block.
 @node The API of libgnunetblock
 @subsubsection The API of libgnunetblock
-@c %**end of header
 The block library requires for each (family of) block type(s) a block
 plugin (implementing @file{gnunet_block_plugin.h}) that provides basic
@@ -7347,7 +7363,7 @@ If a plugin fails to do this, responses may loop in the network.
 @node Queries
 @subsubsection Queries
-@c %**end of header
 The query format for any block in GNUnet consists of four main components.
 First, the type of the desired block must be specified. Second, the query
@@ -7375,7 +7391,7 @@ Depending on the results from the plugin, the DHT will then discard the
 @node Sample Code
 @subsubsection Sample Code
-@c %**end of header
 The source code in @strong{plugin_block_test.c} is a good starting point
 for new block plugins --- it does the minimal work by implementing a
@@ -7386,7 +7402,7 @@ block plugin.
 @node Conclusion2
 @subsubsection Conclusion2
-@c %**end of header
 In conclusion, GNUnet subsystems that want to use the DHT need to define a
 block format and write a plugin to match queries and replies. For testing,
@@ -7400,7 +7416,7 @@ of error checking that results from this primitive implementation.
 @node libgnunetdht
 @subsection libgnunetdht
-@c %**end of header
 The DHT API itself is pretty simple and offers the usual GET and PUT
 functions that work as expected. The specified block type refers to the
@@ -7418,7 +7434,7 @@ data stored in the network.
 @node GET
 @subsubsection GET
-@c %**end of header
 When using GET, the main consideration for developers (other than the
 block library) should be that after issuing a GET, the DHT will
@@ -7446,7 +7462,7 @@ bandwidth consumption.
 @node PUT
 @subsubsection PUT
-@c %**end of header
 @c inconsistent use of ``must'' above it's written ``MUST''
 In contrast to GET operations, developers @strong{must} manually re-run
@@ -7468,7 +7484,7 @@ DHT PUT operations should be repeated at least every 1-2 hours.
 @node MONITOR
 @subsubsection MONITOR
-@c %**end of header
 The DHT API also allows applications to monitor messages crossing the
 local DHT service.
@@ -7491,7 +7507,7 @@ number of workers will process the distributed workload.
 @node DHT Routing Options
 @subsubsection DHT Routing Options
-@c %**end of header
 There are two important options for GET and PUT requests:
@@ -7521,7 +7537,7 @@ in the future offer performance improvements for clique topologies.
 @node The DHT Client-Service Protocol
 @subsection The DHT Client-Service Protocol
-@c %**end of header
 @menu
 * PUTting data into the DHT::
@@ -7532,7 +7548,7 @@ in the future offer performance improvements for clique topologies.
 @node PUTting data into the DHT
 @subsubsection PUTting data into the DHT
-@c %**end of header
 To store (PUT) data into the DHT, the client sends a
 @code{struct GNUNET_DHT_ClientPutMessage} to the service.
@@ -7553,7 +7569,7 @@ in the P2P interaction.
 @node GETting data from the DHT
 @subsubsection GETting data from the DHT
-@c %**end of header
 To retrieve (GET) data from the DHT, the client sends a
 @code{struct GNUNET_DHT_ClientGetMessage} to the service. The message
@@ -7592,7 +7608,7 @@ service --- and to stop them individually.
 @node Monitoring the DHT
 @subsubsection Monitoring the DHT
-@c %**end of header
 To begin monitoring, the client sends a
 @code{struct GNUNET_DHT_MonitorStartStop} message to the DHT service.
@@ -7607,7 +7623,7 @@ these messages contains all of the information about the event.
 @node The DHT Peer-to-Peer Protocol
 @subsection The DHT Peer-to-Peer Protocol
-@c %**end of header
 @menu
@@ -7619,7 +7635,7 @@ these messages contains all of the information about the event.
 @node Routing GETs or PUTs
 @subsubsection Routing GETs or PUTs
-@c %**end of header
 When routing GETs or PUTs, the DHT service selects a suitable subset of
 neighbours for forwarding. The exact number of neighbours can be zero or
@@ -7634,7 +7650,7 @@ traversed; those peers are also excluded from the selection.
 @node PUTting data into the DHT2
 @subsubsection PUTting data into the DHT2
-@c %**end of header
 To PUT data into the DHT, the service sends a @code{struct PeerPutMessage}
 of type @code{GNUNET_MESSAGE_TYPE_DHT_P2P_PUT} to the respective
@@ -7656,7 +7672,7 @@ its own identity (this is done to reduce bandwidth).
 @node GETting data from the DHT2
 @subsubsection GETting data from the DHT2
-@c %**end of header
 A peer can search the DHT by sending @code{struct PeerGetMessage}s of type
 @code{GNUNET_MESSAGE_TYPE_DHT_P2P_GET} to other peers. In addition to the
@@ -7695,7 +7711,7 @@ The DHT service may also cache forwarded results locally if the
 @node GNU Name System (GNS)
 @section GNU Name System (GNS)
-@c %**end of header
 The GNU Name System (GNS) is a decentralized database that enables users
 to securely resolve names to values.
@@ -7750,7 +7766,7 @@ record types.
 @node libgnunetgns
 @subsection libgnunetgns
-@c %**end of header
 The GNS API itself is extremely simple. Clients first connect to the
 GNS service using @code{GNUNET_GNS_connect}.
@@ -7768,7 +7784,7 @@ Once finished, clients disconnect using @code{GNUNET_GNS_disconnect}.
 @node Looking up records
 @subsubsection Looking up records
-@c %**end of header
 @code{GNUNET_GNS_lookup} takes a number of arguments:
@@ -7810,7 +7826,7 @@ must no longer be canceled.
 @node Accessing the records
 @subsubsection Accessing the records
-@c %**end of header
 The @code{libgnunetgnsrecord} library provides an API to manipulate the
 GNS record array that is given to proc. In particular, it offers
@@ -7824,7 +7840,7 @@ functions for parsing (and serializing) common types of DNS records.
 @node Creating records
 @subsubsection Creating records
-@c %**end of header
 Creating GNS records is typically done by building the respective record
 information (possibly with the help of @code{libgnunetgnsrecord} and
@@ -7835,7 +7851,7 @@ operation.
 @node Future work
 @subsubsection Future work
-@c %**end of header
 In the future, we want to expand @code{libgnunetgns} to allow
 applications to observe shortening operations performed during GNS
@@ -7845,7 +7861,7 @@ this happens.
 @node libgnunetgnsrecord
 @subsection libgnunetgnsrecord
-@c %**end of header
 The @code{libgnunetgnsrecord} library is used to manipulate GNS
 records (in plaintext or in their encrypted format).
@@ -7871,7 +7887,7 @@ standard GNS record types.
 @node Value handling
 @subsubsection Value handling
-@c %**end of header
 @code{GNUNET_GNSRECORD_value_to_string} can be used to convert
 the (binary) representation of a GNS record value to a human readable,
@@ -7886,7 +7902,7 @@ a GNS record value.
 @node Type handling
 @subsubsection Type handling
-@c %**end of header
 @code{GNUNET_GNSRECORD_typename_to_number} can be used to obtain the
 numeric value associated with a given typename. For example, given the
@@ -7904,7 +7920,7 @@ typename "A".
 @node GNS plugins
 @subsection GNS plugins
-@c %**end of header
 Adding a new GNS record type typically involves writing (or extending) a
 GNSRECORD plugin. The plugin needs to implement the
@@ -7930,7 +7946,7 @@ typenames and numbers documented in the previous subsection.
 @node The GNS Client-Service Protocol
 @subsection The GNS Client-Service Protocol
-@c %**end of header
 The GNS client-service protocol consists of two simple messages, the
 @code{LOOKUP} message and the @code{LOOKUP_RESULT}. Each @code{LOOKUP}
@@ -7950,7 +7966,7 @@ They can thus be deserialized using
 @node Hijacking the DNS-Traffic using gnunet-service-dns
 @subsection Hijacking the DNS-Traffic using gnunet-service-dns
-@c %**end of header
 This section documents how the gnunet-service-dns (and the
 gnunet-helper-dns) intercepts DNS queries from the local system.
@@ -7987,7 +8003,7 @@ interface with the original nameserver as source address.
 @node Network Setup Details
 @subsubsection Network Setup Details
-@c %**end of header
 The DNS interceptor adds the following rules to the Linux kernel:
 @example
@@ -8008,7 +8024,7 @@ arbitrarily). The third line adds a routing policy based on this mark
 @node Serving DNS lookups via GNS on W32
 @subsection Serving DNS lookups via GNS on W32
-@c %**end of header
 This section documents how the libw32nsp (and
 gnunet-gns-helper-service-w32) do DNS resolutions of DNS queries on the
@@ -8078,10 +8094,9 @@ This includes some of well known utilities, like "ping" and "nslookup".
 @node Importing DNS Zones into GNS
 @subsection Importing DNS Zones into GNS
-@c %**end of header
 This section discusses the challenges and problems faced when writing the
-Ascension tool. It also takes a look at possible improvements in the future.
+Ascension tool. It also takes a look at possible improvements in the
+future.
 @menu
 * Conversions between DNS and GNS::
@@ -8089,29 +8104,31 @@ Ascension tool. It also takes a look at possible improvements in the future.
 * Performance::
 @end menu
+@cindex DNS Conversion
 @node Conversions between DNS and GNS
 @subsubsection Conversions between DNS and GNS
 The differences between the two name systems lies in the details
-and is not always transparent. For instance an SRV record is converted to a
+and is not always transparent.
-GNS only BOX record.
+For instance an SRV record is converted to a GNS only BOX record.
 This is done by converting to a BOX record from an existing SRV record:
 @example
 # SRV
 # _service._proto.name. TTL class SRV priority weight port target
-_sip._tcp.example.com. 14000 IN SRV     0 0 5060 www.example.com.
+_sip._tcp.example.com. 14000 IN SRV     0 0 5060 www.example.com.
 # BOX
 # TTL BOX flags port protocol recordtype priority weight port target
 14000 BOX n 5060 6 33 0 0 5060 www.example.com
 @end example
-Other records that have such a transformation is the MX record type, as well as
+Other records that have such a transformation is the MX record type,
-the SOA record type.
+as well as the SOA record type.
+Transformation of a SOA record into GNS works as described in the
+following example. Very important to note are the rname and mname keys.
-Transformation of a SOA record into GNS works as described in the following
-example. Very important to note are the rname and mname keys.
 @example
 # BIND syntax for a clean SOA record
 @   IN SOA master.example.com. hostmaster.example.com. (
@@ -8235,7 +8252,7 @@ that uses the C API would be cleaner and better.
 @node GNS Namecache
 @section GNS Namecache
-@c %**end of header
 The NAMECACHE subsystem is responsible for caching (encrypted) resolution
 results of the GNU Name System (GNS). GNS makes zone information available
@@ -8274,7 +8291,7 @@ plugin API.
 @node libgnunetnamecache
 @subsection libgnunetnamecache
-@c %**end of header
 The NAMECACHE API consists of five simple functions. First, there is
 @code{GNUNET_NAMECACHE_connect} to connect to the NAMECACHE service.
@@ -8297,7 +8314,7 @@ The maximum size of a block that can be stored in the NAMECACHE is
 @node The NAMECACHE Client-Service Protocol
 @subsection The NAMECACHE Client-Service Protocol
-@c %**end of header
 All messages in the NAMECACHE IPC protocol start with the
 @code{struct GNUNET_NAMECACHE_Header} which adds a request
@@ -8315,7 +8332,7 @@ out-of-order.
 @node Lookup
 @subsubsection Lookup
-@c %**end of header
 The @code{struct LookupBlockMessage} is used to lookup a block stored in
 the cache.
@@ -8329,7 +8346,7 @@ of the block.
 @node Store
 @subsubsection Store
-@c %**end of header
 The @code{struct BlockCacheMessage} is used to cache a block in the
 NAMECACHE.
@@ -8341,7 +8358,7 @@ message as well.
 @node The NAMECACHE Plugin API
 @subsection The NAMECACHE Plugin API
-@c %**end of header
 The NAMECACHE plugin API consists of two functions, @code{cache_block} to
 store a block in the database, and @code{lookup_block} to lookup a block
@@ -8356,7 +8373,7 @@ in the database.
 @node Lookup2
 @subsubsection Lookup2
-@c %**end of header
 The @code{lookup_block} function is expected to return at most one block
 to the iterator, and return @code{GNUNET_NO} if there were no non-expired
@@ -8367,7 +8384,7 @@ supposed to return the result with the largest expiration time.
 @node Store2
 @subsubsection Store2
-@c %**end of header
 The @code{cache_block} function is expected to try to store the block in
 the database, and return @code{GNUNET_SYSERR} if this was not possible
@@ -8384,7 +8401,7 @@ block is more recent during the store operation.
 @cindex REVOCATION Subsystem
 @node REVOCATION Subsystem
 @section REVOCATION Subsystem
-@c %**end of header
 The REVOCATION subsystem is responsible for key revocation of Egos.
 If a user learns that theis private key has been compromised or has lost
@@ -8404,7 +8421,7 @@ propagate revocation messages.
 @node Dissemination
 @subsection Dissemination
-@c %**end of header
 When a revocation is performed, the revocation is first of all
 disseminated by flooding the overlay network.
@@ -8428,7 +8445,7 @@ The SET service is used to perform this operation efficiently.
 @node Revocation Message Design Requirements
 @subsection Revocation Message Design Requirements
-@c %**end of header
 However, flooding is also quite costly, creating O(|E|) messages on a
 network with |E| edges.
@@ -8450,7 +8467,7 @@ revocation message ahead of time and store it in a secure location.
 @node libgnunetrevocation
 @subsection libgnunetrevocation
-@c %**end of header
 The REVOCATION API consists of two parts, to query and to issue
 revocations.
@@ -8465,7 +8482,7 @@ revocations.
 @node Querying for revoked keys
 @subsubsection Querying for revoked keys
-@c %**end of header
 @code{GNUNET_REVOCATION_query} is used to check if a given ECDSA public
 key has been revoked.
@@ -8476,7 +8493,7 @@ the return value.
 @node Preparing revocations
 @subsubsection Preparing revocations
-@c %**end of header
 It is often desirable to create a revocation record ahead-of-time and
 store it in an off-line location to be used later in an emergency.
@@ -8544,7 +8561,7 @@ successfully.
 @node The REVOCATION Peer-to-Peer Protocol
 @subsection The REVOCATION Peer-to-Peer Protocol
-@c %**end of header
 Revocation uses two disjoint ways to spread revocation information among
 peers.
@@ -8579,7 +8596,7 @@ larger hashed peer identity.
 @node File-sharing (FS) Subsystem
 @section File-sharing (FS) Subsystem
-@c %**end of header
 This chapter describes the details of how the file-sharing service works.
 As with all services, it is split into an API (libgnunetfs), the service
@@ -8617,7 +8634,7 @@ NOTE: The documentation in this chapter is quite incomplete.
 @node Encoding for Censorship-Resistant Sharing (ECRS)
 @subsection Encoding for Censorship-Resistant Sharing (ECRS)
-@c %**end of header
 When GNUnet shares files, it uses a content encoding that is called ECRS,
 the Encoding for Censorship-Resistant Sharing.
@@ -8639,7 +8656,7 @@ thus did not warrant space in the research report.
 @node Namespace Advertisements
 @subsubsection Namespace Advertisements
-@c %**end of header
 @c %**FIXME: all zeroses -> ?
 An @code{SBlock} with identifier all zeros is a signed
@@ -8654,7 +8671,7 @@ can search for @code{SBlock}s in order to find out more about a namespace.
 @node KSBlocks
 @subsubsection KSBlocks
-@c %**end of header
 GNUnet implements @code{KSBlocks} which are @code{KBlocks} that, instead
 of encrypting a CHK and metadata, encrypt an @code{SBlock} instead.
@@ -8680,7 +8697,7 @@ Collections are also advertised using @code{KSBlock}s.
 @node File-sharing persistence directory structure
 @subsection File-sharing persistence directory structure
-@c %**end of header
 This section documents how the file-sharing library implements
 persistence of file-sharing operations and specifically the resulting
@@ -8766,7 +8783,7 @@ Note that unindex operations cannot have associated child operations.
 @node REGEX Subsystem
 @section REGEX Subsystem
-@c %**end of header
 Using the REGEX subsystem, you can discover peers that offer a particular
 service using regular expressions.
@@ -8789,7 +8806,7 @@ thesis.
 @node How to run the regex profiler
 @subsection How to run the regex profiler
-@c %**end of header
 The gnunet-regex-profiler can be used to profile the usage of mesh/regex
 for a given set of regular expressions and strings.
@@ -8922,7 +8939,7 @@ regular expressions.
 @node REST Subsystem
 @section REST Subsystem
-@c %**end of header
 Using the REST subsystem, you can expose REST-based APIs or services.
 The REST service is designed as a pluggable architecture.
diff --git a/doc/handbook/chapters/installation.texi b/doc/handbook/chapters/installation.texi
index a907a1046..ad848b4a0 100644
--- a/doc/handbook/chapters/installation.texi
+++ b/doc/handbook/chapters/installation.texi
@@ -12,9 +12,9 @@ package manager.
 * Create @code{gnunet} user and group::
 * Preparing and Compiling the Source Code::
 * Installation::
-* MOVED FROM USER Checking the Installation::
+* Checking the Installation::
-* MOVED FROM USER The graphical configuration interface::
+* The graphical configuration interface::
-* MOVED FROM USER Config Leftovers::
+* Config Leftovers::
 @end menu
 @c -----------------------------------------------------------------------
@@ -27,36 +27,54 @@ link to the project websites.
 The mandatory libraries and applications are
 @itemize @bullet
-@item libtool
 @item autoconf 2.59 or above
 @item automake 1.11.1 or above
-@item pkg-config
+@item gettext
+@item glibc (read below, other libcs should work)
+@item gnutls 3.2.12 or above, recommended to be linked against libunbound
+@item iptables (on Linux systems)
+@item libtool 2.2 or above
+@item libltdl (part of libtool)
 @item libgcrypt 1.6 or above
 @item libextractor
-@item libidn
+@item libidn2 or libidn
 @item libmicrohttpd 0.9.52 or above
-@item libnss
 @item libunistring
-@item gettext
-@item glibc
 @item libgmp
-@item gnutls
+@item libgnurl or libcurl (libcurl has to be linked to GnuTLS) 7.35.0 or above
-@item libcurl (has to be linked to GnuTLS) or libgnurl
+@item Texinfo 5.2 or above (for building the documentation)
+@item Texlive 2012 or above (for building the documentation, and for gnunet-bcd)
+@item makeinfo 4.8 or above
 @item zlib
 @end itemize
+Glibc is required for certain NSS features:
+@example
+One mechanism of integrating GNS with legacy applications via NSS is
+not available if this is disabled. But applications that don't use the
+glibc for NS resolution won't work anyway with this, so little is lost
+on BSD systems.
+GNS via direct use or via the HTTP or DNS proxies is unaffected.
+@end example
+Other libcs should work, the resulting builds just don't include the
+glibc NSS specific code. One example is the build against NetBSD's libc
+as detailed in @uref{https://bugs.gnunet.org/view.php?id=5605}.
 In addition GNUnet needs one of of these three databases
 @itemize @bullet
-@item sqlite + libsqlite (the default, requires no further configuration)
+@item sqlite + libsqlite 3.8 or above (the default, requires no further configuration)
 @item postgres + libpq
 @item mysql + libmysqlclient
 @end itemize
 These are the dependencies only required for certain features
 @itemize @bullet
-@item Texinfo (for building the documentation)
+@item guile 1.6.4 for gnunet-download-manager
-@item Texlive (for building the documentation)
 @item miniupnpc (for traversing NAT boxes more reliably)
+@item libnss
+@item libglpk 4.45 or above for experimental code
 @item libopus (for running the GNUnet conversation telephony application)
 @item libpulse (for running the GNUnet conversation telephony application)
 @item libogg (for running the GNUnet conversation telephony application)
@@ -65,6 +83,24 @@ These are the dependencies only required for certain features
 (for attribute-based encryption and the identity provider subsystem)
 @item libgabe
 (for attribute-based encryption and the identity provider subsystem)
+@item texi2mdoc (for automatic mdoc generation)
+@item perl5 for some utilities
+@end itemize
+These are the test suite requirements:
+@itemize @bullet
+@item python3.7
+@item gnunet (installation first)
+@item which(1)
+@item a shell (possibly Bash, maybe just POSIX sh)
+@end itemize
+These are runtime requirements:
+@itemize @bullet
+@item nss (the certutil binary, for gnunet-gns-proxy-setup-ca)
+@item openssl (openssl binary, for gnunet-gns-proxy-setup-ca)
+@item python2.7 for gnunet-qr (at the moment only python2.7 supported)
+@item python-zbar 0.10 or above for gnunet-qr
 @end itemize
 @c -----------------------------------------------------------------------
@@ -82,7 +118,7 @@ The archive can be found at
 @uref{https://ftpmirror.gnu.org/gnu/gnunet/}. Extract it using a graphical
 archive tool or @code{tar}:
 @example
-tar xzvf gnunet-0.11.0pre66.tar.gz
+tar xzvf gnunet-@value{VERSION}.tar.gz
 @end example
 In the next chapter we will assume that the source code is available
@@ -116,17 +152,24 @@ running @code{configure} the following options can be specified to
 customize the compilation and installation process:
 @itemize @bullet
-@item @code{--disable-documentation} - don't build the configuration documents
+@item @code{--disable-documentation} - don't build the documentation
 @item @code{--enable-looging=[LOGLEVEL]} - choose a loglevel (@code{debug}, @code{info}, @code{warning} or @code{error})
 @item @code{--prefix=[PATH]} - the directory where the GNUnet libraries and binaries will be installed
 @item @code{--with-extractor=[PATH]} - the path to libextractor
 @item @code{--with-libidn=[PATH]} - the path to libidn
+@item @code{--with-libidn2=[PATH]} - the path to libidn2 (takes priority over libidn if both are found)
 @item @code{--with-microhttpd=[PATH]} - the path to libmicrohttpd
 @item @code{--with-sqlite=[PATH]} - the path to libsqlite
 @item @code{--with-zlib=[PATH]} - the path to zlib
 @item @code{--with-sudo=[PATH]} - path to the sudo binary (no need to run @code{make install} as root if specified)
 @end itemize
+Note that the list above is not always up to date and you
+should check the output of @code{./configure --help}, read
+the @file{configure.ac} or send an email asking for assistance
+if you are in doubt of any configure options or require fixes
+for your operating system.
 The following example configures the installation prefix
 @code{/usr/lib} and disables building the documentation
 @example
@@ -216,9 +259,9 @@ PLUGINS = tcp
-@node MOVED FROM USER Checking the Installation
+@node Checking the Installation
-@section MOVED FROM USER Checking the Installation
+@section Checking the Installation
-@c %**end of header
 This section describes a quick, casual way to check if your GNUnet
 installation works. However, if it does not, we do not cover
@@ -240,7 +283,7 @@ as part of this handbook!.
 @cindex GTK user interface
 @node gnunet-gtk
 @subsection gnunet-gtk
-@c %**end of header
 The @command{gnunet-gtk} package contains several graphical
 user interfaces for the respective GNUnet applications.
@@ -251,17 +294,24 @@ Currently these interfaces cover:
 @item Peer Information
 @item GNU Name System
 @item File Sharing
-@item Identity Management
 @item Conversation
+@item Setup
 @end itemize
+Previously, many of these interfaces were combined into one application
+called @command{gnunet-gtk}, with different tabs for each interface. This
+combined application has been removed in version 0.11.0, but each of the
+interfaces is still available as a standalone application
+(@command{gnunet-statistics-gtk} for statistics, @command{gnunet-fs-gtk}
+for filesharing, etc).
 @node Statistics
 @subsection Statistics
-@c %**end of header
 We assume that you have started gnunet via @code{gnunet-arm} or via your
 system-provided method for starting services.
-First, you should launch GNUnet gtk.
+First, you should launch GNUnet's graphical statistics interface.
 You can do this from the command-line by typing
 @example
@@ -274,7 +324,7 @@ least if your peer has been running for more than a few seconds). The
 lines indicate how many other peers your peer is connected to (via
 different mechanisms) and how large the entire overlay network is
 currently estimated to be. The X-axis represents time (in seconds
-since the start of @command{gnunet-gtk}).
+since the start of @command{gnunet-statistics-gtk}).
 You can click on "Traffic" to see information about the amount of
 bandwidth your peer has consumed, and on "Storage" to check the amount
@@ -290,10 +340,10 @@ whatever it is you are looking at the Gtk+ interface describes a
 @node Peer Information
 @subsection Peer Information
-@c %**end of header
-First, you should launch the graphical user interface.  You can do
-this from the command-line by typing
+First, you should launch the peer information graphical user interface.
+You can do this from the command-line by typing
 @example
 $ gnunet-peerinfo-gtk
@@ -310,8 +360,8 @@ configuration.
 @c NOTE: Inserted from Installation Handbook in original ``order'':
 @c FIXME: Move this to User Handbook.
-@node MOVED FROM USER The graphical configuration interface
+@node The graphical configuration interface
-@section MOVED FROM USER The graphical configuration interface
+@section The graphical configuration interface
 If you also would like to use @command{gnunet-gtk} and
 @command{gnunet-setup} (highly recommended for beginners), do:
@@ -347,7 +397,7 @@ If you also would like to use @command{gnunet-gtk} and
 * Configuring the GNUnet VPN::
 * Bandwidth Configuration::
 * Configuring NAT::
-* Peer configuration for distributions::
+* Peer configuration for distributors (e.g. Operating Systems)::
 @end menu
 @node Configuring your peer
@@ -358,7 +408,7 @@ This chapter will describe the various configuration options in GNUnet.
 The easiest way to configure your peer is to use the
 @command{gnunet-setup} tool.
 @command{gnunet-setup} is part of the @command{gnunet-gtk}
-application. You might have to install it separately.
+package. You might have to install it separately.
 Many of the specific sections from this chapter actually are linked from
 within @command{gnunet-setup} to help you while using the setup tool.
@@ -837,7 +887,7 @@ a @code{gn090} table here, it probably works.
 @node Configuring the datacache
 @subsection Configuring the datacache
-@c %**end of header
 The datacache is what GNUnet uses for storing temporary data. This data is
 expected to be wiped completely each time GNUnet is restarted (or the
@@ -889,7 +939,8 @@ strength of the adversary).
 @node Configuring logging
 @subsection Configuring logging
-Logging in GNUnet 0.9.0 is controlled via the "-L" and "-l" options.
+Since version 0.9.0, logging in GNUnet is controlled via the
+@code{-L} and @code{-l} options.
 Using @code{-L}, a log level can be specified. With log level
 @code{ERROR} only serious errors are logged.
 The default log level is @code{WARNING} which causes anything of
@@ -1765,7 +1816,7 @@ The other options as shown on the gnunet-setup tool are:
 @node IPv4 address for interface
 @subsubsection IPv4 address for interface
-This is the IPv4 address the VPN interface will get. You should pick an
+This is the IPv4 address the VPN interface will get. You should pick a
 'private' IPv4 network that is not yet in use for you system. For example,
 if you use @code{10.0.0.1/255.255.0.0} already, you might use
 @code{10.1.0.1/255.255.0.0}.
@@ -1920,29 +1971,29 @@ connect to NATed peers using autonomous NAT traversal, you need to check
 the "Enable connecting to NATed peers using ICMP method" box.
-@node Peer configuration for distributions
+@node Peer configuration for distributors (e.g. Operating Systems)
-@subsection Peer configuration for distributions
+@subsection Peer configuration for distributors (e.g. Operating Systems)
 The "GNUNET_DATA_HOME" in "[path]" in @file{/etc/gnunet.conf} should be
 manually set to "/var/lib/gnunet/data/" as the default
 "~/.local/share/gnunet/" is probably not that appropriate in this case.
-Similarly, distributions may consider pointing "GNUNET_RUNTIME_DIR" to
+Similarly, distributors may consider pointing "GNUNET_RUNTIME_DIR" to
 "/var/run/gnunet/" and "GNUNET_HOME" to "/var/lib/gnunet/". Also, should a
-distribution decide to override system defaults, all of these changes
+distributor decide to override system defaults, all of these changes
 should be done in a custom @file{/etc/gnunet.conf} and not in the files
 in the @file{config.d/} directory.
 Given the proposed access permissions, the "gnunet-setup" tool must be
 run as use "gnunet" (and with option "-c /etc/gnunet.conf" so that it
 modifies the system configuration). As always, gnunet-setup should be run
-after the GNUnet peer was stopped using "gnunet-arm -e". Distributions
+after the GNUnet peer was stopped using "gnunet-arm -e". Distributors
 might want to include a wrapper for gnunet-setup that allows the
 desktop-user to "sudo" (i.e. using gtksudo) to the "gnunet" user account
 and then runs "gnunet-arm -e", "gnunet-setup" and "gnunet-arm -s" in
 sequence.
-@node MOVED FROM USER Config Leftovers
+@node Config Leftovers
-@section MOVED FROM USER Config Leftovers
+@section Config Leftovers
 This section describes how to start a GNUnet peer. It assumes that you
 have already compiled and installed GNUnet and its' dependencies.
@@ -2201,7 +2252,7 @@ However, as TCP is generally less efficient and it is rarely the case
 that a single GNUnet peer is supposed to serve an entire local network,
 the default configuration should disable TCP access to all GNUnet
 services on systems with support for UNIX domain sockets.
-As of GNUnet 0.9.2, configuration files with TCP access disabled should be
+Since GNUnet 0.9.2, configuration files with TCP access disabled should be
 generated by default. Users can re-enable TCP access to particular
 services simply by specifying a non-zero port number in the section of
 the respective service.
diff --git a/doc/handbook/chapters/keyconcepts.texi b/doc/handbook/chapters/keyconcepts.texi
index 829fed82e..4b49a7ffb 100644
--- a/doc/handbook/chapters/keyconcepts.texi
+++ b/doc/handbook/chapters/keyconcepts.texi
@@ -246,7 +246,7 @@ encryption as the link-encryption between the nodes.  GNUnet has
 encryption on the network layer (link encryption, confidentiality,
 authentication) and again on the application layer (provided
 by @command{gnunet-publish}, @command{gnunet-download},
-@command{gnunet-search} and @command{gnunet-gtk}).
+@command{gnunet-search} and @command{gnunet-fs-gtk}).
 Refer to the following paper for more:
 Christian Grothoff, Krista Grothoff, Tzvetan Horozov,
diff --git a/doc/handbook/chapters/preface.texi b/doc/handbook/chapters/preface.texi
index 386cefa6d..636458eeb 100644
--- a/doc/handbook/chapters/preface.texi
+++ b/doc/handbook/chapters/preface.texi
@@ -1,13 +1,17 @@
 @node Preface
 @chapter Preface
-This collection of manuals describes how to use GNUnet, a framework
+@c FIXME: Do we have to mention that this is Free Software?
+@c FIXME: where did 'Free Software' in this sentence fit before
+@c FIXME: we changed it?
+This collection of manuals describes GNUnet, a framework
 for secure peer-to-peer networking with the high-level goal to provide
-a strong foundation Free Software for a global, distributed network
+a strong foundation for a global, distributed network
-that provides security and privacy.  GNUnet in that sense aims to
+that provides security and privacy.
-replace the current Internet protocol stack.  Along with an
+GNUnet in that sense aims to replace the current Internet protocol stack.
-application for secure publication of files, it has grown to include
+Along with an application for secure publication of files, it has grown to
-all kinds of basic applications for the foundation of a new Internet.
+include all kinds of basic applications for the foundation of a new
+Internet.
 @menu
 * About this book::
@@ -22,47 +26,74 @@ all kinds of basic applications for the foundation of a new Internet.
 The books (described as ``book'' or ``books'' in the following)
 bundled as the ``GNUnet Reference Manual'' are based on the historic
-work of all contributors to GNUnet's documentation.  It is our hope
+work of all contributors to previous documentation of GNUnet.
+It is our hope
 that the content is described in a way that does not require any
 academic background, although some concepts will require further
 reading.
-Our (long-term) goal with these books is to keep them self-contained. If
+Our (long-term) goal with these books is to keep them
-you see references to Wikipedia and other external sources (except for
+self-contained. If you see references to Wikipedia and other external
-our academic papers) it means that we are working on a solution to
+sources (except for our academic papers) it means that we are working
-describe the explanations found there which fits our use-case and licensing.
+on a solution to describe the explanations found there which fits our
+use-case and licensing.
-The first chapter (``Preface'') as well as the the second
-chapter (``Philosophy'') give an introduction to GNUnet as a project,
+Previously the documentation was contained in Drupal books, on the
-what GNUnet tries to achieve.
+old website. This format was considered unmaintainable for the future, so
+Texinfo was chosen. You might find old and very old sections in
+here in addition to more recent content. It took a long time to
+finish the move to Texinfo (from Drupal to LaTeX to wrong Texinfo
+output dump to good Texinfo) and only recently (late 2018, early
+2019) content checking started. We apologize to the reader for
+any inconvenience and hope you apply logic where bad advice from
+10 years ago can be found (pipe to sudo to install software is
+one example). Patches (contributions) to this documentation are more
+than welcome!
+The first chapter (``Preface'') as well as the the second chapter
+(``Philosophy'') give an introduction to GNUnet as a project, what
+GNUnet tries to achieve. ``Key Concepts'' explains the key concepts
+in GNUnet.
+These three chapters are the most complete in the documentation.
+They are followed by chapters which explain specific parts of
+GNUnet (and need more work):
+``Installing GNUnet'', ``GNUnet Contributors Handbook'' and
+``GNUnet Developer Handbook''.
 @node Contributing to this book
 @section Contributing to this book
+@c FIXME: There's a good amount of repetition here, we should
+@c FIXME: fix this.
 The GNUnet Reference Manual is a collective work produced by various
-people throughout the years. The version you are reading is derived
+people throughout the years.
-from many individual efforts hosted on our website. This was a failed
-experiment, and with the conversion to Texinfo we hope to address this
+The version you are reading is derived
-in the longterm. Texinfo is the documentation language of the GNU project.
+from many individual efforts hosted on one of our old websites.
+In the end it was considered to be impractical to read by
+those who required the information.
+With the conversion to Texinfo --- the version you are reading
+right now --- we hope to address this in the longterm.
+Texinfo is the documentation language of the GNU project.
 While it can be intimidating at first and look scary or complicated,
-it is just another way to express text format instructions. We encourage
+it is just another way to express text format instructions.
-you to take this opportunity and learn about Texinfo, learn about GNUnet,
-and one word at a time we will arrive at a book which explains GNUnet in
+We encourage you to take this opportunity and learn about Texinfo,
-the least complicated way to you. Even when you don't want or can't learn
+learn about GNUnet, and one word at a time we will arrive at a
-Texinfo, you can contribute. Send us an Email or join our IRC chat room
+book which explains GNUnet in the least complicated way to you.
-on freenode and talk with us about the documentation (the prefered way
-to reach out is the mailinglist, since you can communicate with us
+Even when you don't want to or can't learn Texinfo, you can contribute.
-without waiting on someone in the chatroom). One way or another you
+Send us an Email or join our IRC chat room on freenode and talk with
-can help shape the understanding of GNUnet without the ability to read
+us about the documentation (the prefered way to reach out is the
-and understand its sourcecode.
+mailinglist, since you can communicate with us without waiting on
+someone in the chatroom).
+One way or another you can help shape the understanding of GNUnet
+without the ability to read and understand its sourcecode.
 @node Introduction
 @section Introduction
-@c In less than 2 printed pages describe the history of GNUnet here,
-@c what we have now and what's still missing (could be split into
-@c subchapters).
 GNUnet in its current version is the result of almost 20 years of work
 from many contributors.  So far, most contributions were made by
 volunteers or people paid to do fundamental research.  At this stage,
@@ -109,12 +140,17 @@ social network, resulting in a significant growth of the core team.
 In 2013, we launched @uref{https://taler.net, GNU Taler} to address
 the challenge of convenient
 and privacy-preserving online payments.  In 2015, the
-@c TODO: Maybe even markup for the E if it renders in most outputs.
+@c XXX: It is not correct to refer to pEp as pEp stylistic,
-@uref{https://pep.foundation/, pEp} (pretty Easy privacy) project
+@c XXX: but the correct version would lead to problems with
+@c XXX: some of our outputs and/or older versions of texinfo
+@c XXX: and devices that display versions on consoles etc.
+@c XXX: This is why we keep the pEp until proven that p(tripple bar)p
+@c XXX: does not create broken outputs.
+@uref{https://pep.foundation/, pretty Easy privacy} (pEp) project
 announced that they will use GNUnet as the technology for their
 meta-data protection layer, ultimately resulting in GNUnet e.V.
 entering into a formal long-term collaboration with the pEp
-foundation.  In 2016, Taler Systems SA, a first startup using GNUnet
+Foundation.  In 2016, Taler Systems SA, a first startup using GNUnet
 technology, was founded with support from the community.
 GNUnet is not merely a technical project, but also a political
@@ -131,7 +167,7 @@ Similarly its flaws are not limited to the protocol design.  Thus,
 technical excellence by itself will not suffice to create a better
 network. We also need to build a community that is wise, humble and
 has a sense of humor to achieve our goal to create a technical
-foundation for a society we would like to live in. 
+foundation for a society we would like to live in.
 @node Project governance
@@ -142,15 +178,12 @@ follows the governance model of a benevolent dictator.  This means
 that ultimately, the GNU project appoints the GNU maintainer and can
 overrule decisions made by the GNUnet maintainer. Similarly, the
 GNUnet maintainer can overrule any decisions made by individual
-@c TODO: Should we mention if this is just about GNUnet? Other projects
-@c TODO: in GNU seem to have rare issues (GCC, the 2018 documentation
-@c TODO: discussion.
 developers.  Still, in practice neither has happened in the last 20
-years, and we hope to keep it that way.
+years for GNUnet, and we hope to keep it that way.
 @c TODO: Actually we are a Swiss association, or just a German association
 @c TODO: with Swiss bylaws/Satzung?
-@c TODO: Rewrite one of the 'GNUnet eV may also' sentences.
+@c TODO: Rewrite one of the 'GNUnet eV may also' sentences?
 The GNUnet project is supported by GNUnet e.V., a German association
 where any developer can become a member.  GNUnet e.V. serves as a
 legal entity to hold the copyrights to GNUnet.  GNUnet e.V. may also
diff --git a/doc/handbook/chapters/user.texi b/doc/handbook/chapters/user.texi
index 1300b2bb6..37c5849ab 100644
--- a/doc/handbook/chapters/user.texi
+++ b/doc/handbook/chapters/user.texi
@@ -1,6 +1,6 @@
 @node Using GNUnet
 @chapter Using GNUnet
-@c %**end of header
 This tutorial is supposed to give a first introduction for users
 trying to do something real with GNUnet. Installation and
@@ -47,7 +47,7 @@ $ gnunet-arm -e
 @node First steps - Using the GNU Name System
 @section First steps - Using the GNU Name System
-@c %**end of header
 @menu
 * Preliminaries::
@@ -65,7 +65,7 @@ $ gnunet-arm -e
 @node Preliminaries
 @subsection Preliminaries
-@c %**end of header
 ``.pin'' is a default zone which points to a zone managed by gnunet.org.
 Use @code{gnunet-config -s gns} to view the GNS configuration, including
@@ -106,7 +106,7 @@ rules - GO0T87F9BPMF8NKD5A54L2AH1T0GRML539TPFSRMCEA98182QD30
 @node The GNS Tab
 @subsection The GNS Tab
-@c %**end of header
 Maintaing your zones is through the NAMESTORE service and is discussed
 here.  You can manage your zone using @command{gnunet-identity} and
@@ -138,7 +138,7 @@ bottom of the window contains the existing entries in the selected zone.
 @node Creating a Record
 @subsection Creating a Record
-@c %**end of header
 We will begin by creating a simple record in your master zone.
 To do this, click on the text "<new name>" in the table. The field is
@@ -168,7 +168,7 @@ to edit it later.
 @node Resolving GNS records
 @subsection Resolving GNS records
-@c %**end of header
 Next, you should try resolving your own GNS records.  The method we
 found to be the most uncomplicated is to do this by explicitly
@@ -191,7 +191,7 @@ the application.
 @node Integration with Browsers
 @subsection Integration with Browsers
-@c %**end of header
 While we recommend integrating GNS using the NSS module in the
 GNU libc Name Service Switch, you can also integrate GNS
@@ -271,7 +271,7 @@ apt-get install texlive-full
 @noindent
 Start creating a business card by clicking the "Copy" button
-in @command{gnunet-gtk}'s GNS tab. Next, you should start
+in @command{gnunet-namestore-gtk}. Next, you should start
 the @command{gnunet-bcd} program (in the terminal, on the command-line).
 You do not need to pass any options, and please be not surprised if
 there is no output:
@@ -286,7 +286,7 @@ where @code{gnunet-bcd} is running a Web server!
 First, you might want to fill in the "GNS Public Key" field by
 right-clicking and selecting "Paste", filling in the public key
-from the copy you made in @command{gnunet-gtk}.
+from the copy you made in @command{gnunet-namestore-gtk}.
 Then, fill in all of the other fields, including your @b{GNS NICKname}.
 Adding a GPG fingerprint is optional.
 Once finished, click "Submit Query".
@@ -302,7 +302,7 @@ You can now go back to the shell running @code{gnunet-bcd} and press
 @node Be Social
 @subsection Be Social
-@c %**end of header
 Next, you should print out your business card and be social.
 Find a friend, help them install GNUnet and exchange business cards with
@@ -424,7 +424,7 @@ performed by using the @command{-p} option of @command{gnunet-revocation}.
 @node What's Next?
 @subsection What's Next?
-@c %**end of header
 This may seem not like much of an application yet, but you have
 just been one of the first to perform a decentralized secure name
@@ -443,7 +443,7 @@ using this new public key infrastructure.
 @pindex gnunet-conservation-gtk
 @node First steps - Using GNUnet Conversation
 @section First steps - Using GNUnet Conversation
-@c %**end of header
 First, you should launch the graphical user interface.  You can do
 this from the command-line by typing
@@ -459,7 +459,7 @@ $ gnunet-conversation-gtk
 @node Testing your Audio Equipment
 @subsection Testing your Audio Equipment
-@c %**end of header
 First, you should use @code{gnunet-conversation-test} to check that your
 microphone and speaker are working correctly. You will be prompted to
@@ -471,7 +471,7 @@ that the correct device is being associated with GNUnet's audio tools.
 @node GNS Zones
 @subsection GNS Zones
-@c %**end of header
 @code{gnunet-conversation} uses GNS for addressing. This means that
 you need to have a GNS zone created before using it. Information
@@ -485,7 +485,7 @@ about how to create GNS zones can be found here.
 @node Picking an Identity
 @subsubsection Picking an Identity
-@c %**end of header
 To make a call with @code{gnunet-conversation}, you first
 need to choose an identity. This identity is both the caller ID
@@ -542,7 +542,7 @@ manually. Save the record.
 @node Calling somebody
 @subsubsection Calling somebody
-@c %**end of header
 Now you can call a buddy. Obviously, your buddy will have to have GNUnet
 installed and must have performed the same steps. Also, you must have
@@ -568,7 +568,7 @@ Either of you can end the call using @command{/cancel}. You can exit
 @node First steps - Using the GNUnet VPN
 @section First steps - Using the GNUnet VPN
-@c %**end of header
 @menu
@@ -581,7 +581,7 @@ Either of you can end the call using @command{/cancel}. You can exit
 @node VPN Preliminaries
 @subsection VPN Preliminaries
-@c %**end of header
 To test the GNUnet VPN, we should first run a web server.
 The easiest way to do this is to just start @code{gnunet-bcd},
@@ -622,7 +622,7 @@ to install the NSS plugins in the proper location.
 @node GNUnet-Exit configuration
 @subsection GNUnet-Exit configuration
-@c %**end of header
 Stop your peer (as user @code{gnunet}, run @command{gnunet-arm -e}) and
 run @command{gnunet-setup}. In @command{gnunet-setup}, make sure to
@@ -638,10 +638,10 @@ Now exit @command{gnunet-setup} and restart your peer
 @node GNS configuration
 @subsection GNS configuration
-@c %**end of header
 Now, using your normal user (not the @code{gnunet} system user), run
-@command{gnunet-gtk}. Select the GNS icon and add a new label www in your
+@command{gnunet-namestore-gtk}. Add a new label www in your
 master zone. For the record type, select @code{VPN}. You should then
 see the VPN dialog:
@@ -654,11 +654,11 @@ identifier that we used in the Exit setup earlier, so here supply "bcd".
 If you want others to be able to use the service, you should probably make
 the record public. For non-public services, you should use a passphrase
 instead of the string "bcd". Save the record and
-exit @command{gnunet-gtk}.
+exit @command{gnunet-namestore-gtk}.
 @node Accessing the service
 @subsection Accessing the service
-@c %**end of header
 You should now be able to access your webserver. Type in:
@@ -681,7 +681,7 @@ your business card.
 @node Using a Browser
 @subsection Using a Browser
-@c %**end of header
 Sadly, modern browsers tend to bypass the Name Services Switch and
 attempt DNS resolution directly. You can either run
@@ -693,7 +693,7 @@ using the HTTP proxy with Chrome does work.
 @node File-sharing
 @section File-sharing
-@c %**end of header
 This chapter documents the GNUnet file-sharing application. The original
 file-sharing implementation for GNUnet was designed to provide
@@ -726,7 +726,7 @@ files.
 @node fs-Searching
 @subsection Searching
-@c %**end of header
 The command @command{gnunet-search} can be used to search
 for content on GNUnet. The format is:
@@ -784,7 +784,7 @@ the file in bytes.
 @node fs-Downloading
 @subsection Downloading
-@c %**end of header
 In order to download a file, you need the whole line returned by
 @command{gnunet-search}.
@@ -823,7 +823,7 @@ current number of bytes downloaded whenever new data was received.
 @node fs-Publishing
 @subsection Publishing
-@c %**end of header
 The command @command{gnunet-publish} can be used to add content
 to the network. The basic format of the command is
@@ -844,7 +844,7 @@ $ gnunet-publish -m "description:GNU License" -k gpl -k test -m "mimetype:text/p
 @node Important command-line options
 @subsubsection Important command-line options
-@c %**end of header
 The option @code{-k} is used to specify keywords for the file that
 should be inserted. You can supply any number of keywords,
@@ -871,7 +871,7 @@ man gnunet-publish
 @node Indexing vs. Inserting
 @subsubsection Indexing vs Inserting
-@c %**end of header
 By default, GNUnet indexes a file instead of making a full copy.
 This is much more efficient, but requires the file to stay unaltered
@@ -907,7 +907,7 @@ able to crack the encryption (e.g. by guessing the keyword.
 @node fs-Concepts
 @subsection Concepts
-@c %**end of header
 For better results with filesharing it is useful to understand the
 following concepts.
@@ -936,7 +936,7 @@ concepts that are used to achieve these goals.
 @node Files
 @subsubsection Files
-@c %**end of header
 A file in GNUnet is just a sequence of bytes. Any file-format is allowed
 and the maximum file size is theoretically @math{2^64 - 1} bytes, except
@@ -946,7 +946,7 @@ using GNU libextractor to obtain keywords.
 @node Keywords
 @subsubsection Keywords
-@c %**end of header
 Keywords are the most simple mechanism to find files on GNUnet.
 Keywords are @strong{case-sensitive} and the search string
@@ -963,7 +963,7 @@ request.
 @node Directories
 @subsubsection Directories
-@c %**end of header
 A directory in GNUnet is a list of file identifiers with meta data.
 The file identifiers provide sufficient information about the files
@@ -986,7 +986,7 @@ other meta information, and possibly even the full original file
 @node Pseudonyms
 @subsubsection Pseudonyms
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1005,7 +1005,7 @@ to copy around).
 @node Namespaces
 @subsubsection Namespaces
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1020,7 +1020,7 @@ same entity (which does not have to be the same person).
 @node Advertisements
 @subsubsection Advertisements
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1045,7 +1045,7 @@ confusion.
 @node Anonymity level
 @subsubsection Anonymity level
-@c %**end of header
 The anonymity level determines how hard it should be for an adversary to
 determine the identity of the publisher or the searcher/downloader. An
@@ -1059,7 +1059,7 @@ it can also significantly hurt performance.
 @node Content Priority
 @subsubsection Content Priority
-@c %**end of header
 Depending on the peer's configuration, GNUnet peers migrate content
 between peers. Content in this sense are individual blocks of a file,
@@ -1076,7 +1076,7 @@ when the block was published initially.
 @node Replication
 @subsubsection Replication
-@c %**end of header
 When peers migrate content to other systems, the replication level
 of a block is used to decide which blocks need to be migrated most
@@ -1088,7 +1088,7 @@ selection is simply random.
 @node Namespace Management
 @subsection Namespace Management
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1108,7 +1108,7 @@ lists all locally available pseudonyms.
 @node Creating Pseudonyms
 @subsubsection Creating Pseudonyms
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1123,7 +1123,7 @@ used.
 @node Deleting Pseudonyms
 @subsubsection Deleting Pseudonyms
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1137,7 +1137,7 @@ unavailable.
 @node Advertising namespaces
 @subsubsection Advertising namespaces
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1157,7 +1157,7 @@ the quality of the content found in it.
 @node Namespace names
 @subsubsection Namespace names
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1172,7 +1172,7 @@ to the NICKNAME to get a unique identifier.
 @node Namespace root
 @subsubsection Namespace root
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1185,7 +1185,7 @@ entry point to the content of the namespace.
 @node File-Sharing URIs
 @subsection File-Sharing URIs
-@c %**end of header
 GNUnet (currently) uses four different types of URIs for
 file-sharing. They all begin with "gnunet://fs/".
@@ -1207,7 +1207,7 @@ into two OR-ed keywords 'foo' and 'bar', not into '"foo bar"'.
 @node Encoding of hash values in URIs
 @subsubsection Encoding of hash values in URIs
-@c %**end of header
 Most URIs include some hash values. Hashes are encoded using
 base32hex (RFC 2938).
@@ -1215,7 +1215,7 @@ base32hex (RFC 2938).
 @cindex chk-uri
 @node Content Hash Key (chk)
 @subsubsection Content Hash Key (chk)
-@c %**end of header
 A chk-URI is used to (uniquely) identify a file or directory
 and to allow peers to download the file. Files are stored in
@@ -1232,7 +1232,7 @@ of the encrypted block).
 @cindex loc-uri
 @node Location identifiers (loc)
 @subsubsection Location identifiers (loc)
-@c %**end of header
 For non-anonymous file-sharing, loc-URIs are used to specify which
 peer is offering the data (in addition to specifying all of the
@@ -1248,7 +1248,7 @@ base32hex) and EXPTIME specifies when the signature expires
 @cindex ksk-uri
 @node Keyword queries (ksk)
 @subsubsection Keyword queries (ksk)
-@c %**end of header
 A keyword-URI is used to specify that the desired operation
 is the search using a particular keyword. The format is simply
@@ -1263,7 +1263,7 @@ Furthermore they must not contain '++'.
 @cindex sks-uri
 @node Namespace content (sks)
 @subsubsection Namespace content (sks)
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1298,7 +1298,7 @@ looking for for testing, we need to begin by publishing a file.
 @node gtk-Publishing
 @subsubsection Publishing
-@c %**end of header
 To publish a file, select "File Sharing" in the menu bar just below the
 "Statistics" icon, and then select "Publish" from the menu.
@@ -1361,7 +1361,7 @@ with progress indicators):
 @node gtk-Searching
 @subsubsection Searching
-@c %**end of header
 Below the menu bar, there are four entry widges labeled "Namespace",
 "Keywords", "Anonymity" and "Mime-type" (from left to right). These
@@ -1386,7 +1386,7 @@ a little area for downloading appears.
 @node gtk-Downloading
 @subsubsection Downloading
-@c %**end of header
 In the downloading area, you can select the target directory (default is
 "Downloads") and specify the desired filename (by default the filename it
@@ -1413,7 +1413,7 @@ That's it, you now know the basics for file-sharing with GNUnet!
 @node The GNU Name System
 @section The GNU Name System
-@c %**end of header
 The GNU Name System (GNS) is secure and decentralized naming system.
@@ -1915,8 +1915,8 @@ Ascension
 Usage:
    ascension <domain> [-d] [-p]
    ascension <domain> <port> [-d] [-p]
-    ascension <domain> -ns <transferns> [-d] [-p]
+    ascension <domain> -n <transferns> [-d] [-p]
-    ascension <domain> -ns <transferns> <port> [-d] [-p]
+    ascension <domain> -n <transferns> <port> [-d] [-p]
    ascension -p | --public
    ascension -h | --help
    ascension -v | --version
@@ -1940,7 +1940,7 @@ To migrate the Syrian top level domain - one of the few top level domains that
 still supports zone transfers - into GNS use the following command:
 @example
-$ ascension sy. -ns ns1.tld.sy. -p
+$ ascension sy. -n ns1.tld.sy. -p
 @end example
 The -p flag will tell GNS to put these records on the DHT so that other users
@@ -1982,10 +1982,14 @@ and enable the service, so that your zone is migrated automatically.
 @section reclaimID Identity Provider
 The reclaimID Identity Provider (IdP) is a decentralized IdP service.
-It allows its users to manage and authorize third parties to access their identity attributes such as email or shipping addresses.
+It allows its users to manage and authorize third parties to access
+their identity attributes such as email or shipping addresses.
-It basically mimics the concepts of centralized IdPs, such as those offered by Google or Facebook.
-Like other IdPs, reclaimID features an (optional) OpenID-Connect 1.0-compliant protocol layer that can be used for websites to integrate reclaimID as an Identity Provider with little effort.
+It basically mimics the concepts of centralized IdPs, such as those
+offered by Google or Facebook.
+Like other IdPs, reclaimID features an (optional) OpenID-Connect
+1.0-compliant protocol layer that can be used for websites to
+integrate reclaimID as an Identity Provider with little effort.
 @menu
 * Managing Attributes::
diff --git a/doc/handbook/gnunet.texi b/doc/handbook/gnunet.texi
index a479d2059..75a9f1f2b 100644
--- a/doc/handbook/gnunet.texi
+++ b/doc/handbook/gnunet.texi
@@ -14,7 +14,7 @@
 @c @set OPENPGP-SIGNING-KEY-ID
 @copying
-Copyright @copyright{} 2001-2018 GNUnet e.V.
+Copyright @copyright{} 2001-2019 GNUnet e.V.
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -72,11 +72,11 @@ This document is the Reference Manual for GNUnet version @value{VERSION}.
 @menu
-* Preface::                         Chapter 0
+* Preface::                         Preface
 * Philosophy::                      About GNUnet
 * Key Concepts::                    Key concepts of GNUnet
 @c * Vocabulary::                      Vocabulary
-* Installing GNUnet::               Installing GNUnet
+* Installing GNUnet::               Installing GNUnet
 * Using GNUnet::                    Using GNUnet
 @c * Configuration Handbook::          Configuring GNUnet
 * GNUnet Contributors Handbook::    Contributing to GNUnet
@@ -122,9 +122,9 @@ Installing GNUnet
 * Create @code{gnunet} user and group::
 * Preparing and Compiling the Source Code::
 * Installation::
-* MOVED FROM USER Checking the Installation::
+* Checking the Installation::
-* MOVED FROM USER The graphical configuration interface::
+* The graphical configuration interface::
-* MOVED FROM USER Config Leftovers::
+* Config Leftovers::
 Using GNUnet
diff --git a/doc/handbook/manual.css b/doc/handbook/manual.css
index 404525dc2..0fe08b83c 100644
--- a/doc/handbook/manual.css
+++ b/doc/handbook/manual.css
@@ -1,6 +1,6 @@
 /* Style-sheet to use for manuals (copied from Emacs) */
-@import url('/style.css');
+@import url('style.css');
 /* makeinfo 6.5 converts @quotation to <blockquote>.  Highlight them.  */
 blockquote {
diff --git a/doc/handbook/run-gendocs.sh b/doc/handbook/run-gendocs.sh
index 5e60a2d0f..e52ae0d23 100755
--- a/doc/handbook/run-gendocs.sh
+++ b/doc/handbook/run-gendocs.sh
@@ -2,7 +2,7 @@
 make version.texi/replacement
-./gendocs.sh --email gnunet-developers@gnu.org gnunet-c-tutorial "GNUnet C Tutorial" -o "manual/gnunet-c-tutorial"
+#./gendocs.sh --email gnunet-developers@gnu.org gnunet-c-tutorial "GNUnet C Tutorial" -o "manual/gnunet-c-tutorial"
 #cd manual
 #mkdir gnunet-c-tutorial
 #mv * gnunet-c-tutorial/
diff --git a/doc/handbook/style.css b/doc/handbook/style.css
index 0c4525437..e5271197b 100644
--- a/doc/handbook/style.css
+++ b/doc/handbook/style.css
@@ -1,6 +1,6 @@
 /* This stylesheet is used by manuals and a few older resources. */
-@import url('/reset.css');
+@import url('reset.css');
 /***  PAGE LAYOUT  ***/
diff --git a/doc/man/.gitignore b/doc/man/.gitignore
index ffd69e11b..38ed67872 100644
--- a/doc/man/.gitignore
+++ b/doc/man/.gitignore
@@ -1 +1,5 @@
 gnunet.conf.5
+groff_lint.log
+*.html
+gnunet-c-tutorial.7
+gnunet-documentation.7
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 53d97b6b9..509e33be7 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -5,7 +5,23 @@ do_subst = $(SED) -e 's,[@]SYSCONFDIR[@],$(sysconfdir),g'
 gnunet.conf.5: gnunet.conf.5.in Makefile
        $(do_subst) < $(srcdir)/gnunet.conf.5.in > gnunet.conf.5
-CLEANFILES = gnunet.conf.5
+if TEXI2MDOC_GENERATION
+gnunet-c-tutorial.7: Makefile gnunet-tutorial.7
+        @echo generated texi2mdoc output || true
+gnunet-tutorial.7: Makefile
+        $(SH) $(srcdir)/texi2mdoc-generation.sh || true
+endif
+CLEANFILES = gnunet.conf.5 *.html
+if TEXI2MDOC_GENERATION
+CLEANFILES += gnunet-documentation.7 gnunet-c-tutorial.7
+endif
+html:
+        $(SH) $(srcdir)/produce_html.sh
 man_MANS = \
  gnunet.conf.5 \
@@ -26,6 +42,7 @@ man_MANS = \
  gnunet-fs.1 \
  gnunet-gns.1 \
  gnunet-gns-proxy.1 \
+  gnunet-gns-proxy-setup-ca.1 \
  gnunet-identity.1 \
  gnunet-cadet.1 \
  gnunet-namecache.1 \
@@ -34,6 +51,7 @@ man_MANS = \
  gnunet-nat.1 \
  gnunet-nat-auto.1 \
  gnunet-nat-server.1 \
+  gnunet-nse.1 \
  gnunet-peerinfo.1 \
  gnunet-publish.1 \
  gnunet-qr.1 \
@@ -53,10 +71,15 @@ man_MANS = \
  gnunet-vpn.1 \
  gnunet-zoneimport.1
+if TEXI2MDOC_GENERATION
+man_MANS += gnunet-c-tutorial.7 gnunet-documentation.7
+endif
 EXTRA_DIST = ${man_MANS} \
- gnunet.conf.5.in
+ gnunet.conf.5.in \
+ texi2mdoc-generation.sh \
+ README
 if TEXI2MDOC_GENERATION
-EXTRA_DIST += gnunet-documentation.7 \
+EXTRA_DIST += gnunet-documentation.7 gnunet-c-tutorial.7
-              gnunet-c-tutorial.7
 endif
diff --git a/doc/man/README b/doc/man/README
new file mode 100644
index 000000000..fb95a11f2
--- /dev/null
+++ b/doc/man/README
@@ -0,0 +1,8 @@
+Please note that new edits in files which already are in mdoc format
+should only be done in mdoc format.
+TODO:
+* incomplete pages:
+  - gnunet-timeout
+  
+\ No newline at end of file
diff --git a/doc/man/gnunet-arm.1 b/doc/man/gnunet-arm.1
index b17e74a73..c25b10bb5 100644
--- a/doc/man/gnunet-arm.1
+++ b/doc/man/gnunet-arm.1
@@ -1,78 +1,134 @@
-.TH GNUNET\-ARM 1 "January 4, 2012" "GNUnet"
+.\" This file is part of GNUnet.
-.SH NAME
+.\" Copyright (C) 2001-2019 GNUnet e.V.
-gnunet\-arm \- control GNUnet services
+.\"
-.SH SYNOPSIS
+.\" Permission is granted to copy, distribute and/or modify this document
-.B gnunet\-arm
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
-.RI [ options ]
+.\" any later version published by the Free Software Foundation; with no
-.SH DESCRIPTION
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
-\fBgnunet\-arm\fP can be used to start or stop GNUnet services, including
+.\" copy of the license is included in the file
-the ARM service itself.  The ARM service is a supervisor for GNUnet's
+.\" ``FDL-1.3''.
-service processes.  ARM starts services on-demand or as configured and
+.\"
-re-starts them if they crash.
+.\" A copy of the license is also available from the Free Software
-.SH OPTIONS
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/fdl.html}.
-.B
+.\"
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.\" Alternately, this document is also available under the General
+.\" Public License, version 3 or later, as published by the Free Software
+.\" Foundation.  A copy of the license is included in the file
+.\" ``GPL3''.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/gpl.html}.
+.\"
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
+.\"
+.Dd January 4, 2012
+.Dt GNUNET-ARM 1
+.Os
+.Sh NAME
+.Nm gnunet-arm
+.Nd
+control GNUnet services
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl d | \-delete
+.Op Fl e | \-end
+.Op Fl E | \-no-stderr
+.Op Fl h | \-help
+.Op Fl i Ar SERVICE | Fl \-init= Ns Ar SERVICE
+.Op Fl I | \-info
+.Op Fl k Ar SERVICE | Fl \-kill= Ns Ar SERVICE
+.Op Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME
+.Op Fl L Ar LOGLEVEL |  Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl m | \-monitor
+.Op Fl O | \-no-stdout
+.Op Fl q | \-quiet
+.Op Fl r | \-restart
+.Op Fl s | \-start
+.Op Fl T DELAY | \-timeout= Ns Ar TIMEOUT
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+can be used to start or stop GNUnet services, including the ARM service itself.
+The ARM service is a supervisor for GNUnet's service processes.
+ARM starts services on-demand or as configured and restarts them if they crash.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
+.It Fl d | \-delete
-.IP "\-e, \-\-end"
+Delete config file and directory on exit.
-Shutdown all GNUnet services (including ARM itself).  Running
+.It Fl e | \-end
-"gnunet-arm \-e" is the usual way to shutdown a GNUnet peer.
+Shutdown all GNUnet services (including ARM itself).
-.B
+Running "gnunet-arm \-e" is the usual way to shutdown a GNUnet peer.
-.IP "\-h, \-\-help"
+.It Fl E | \-no-stderr
+Don't let gnunet-arm inherit standard error.
+.It Fl h | \-help
 Print short help on options.
-.B
+.It Fl i Ar SERVICE | Fl \-init= Ns Ar SERVICE
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
+Starts the specified SERVICE if it is not already running.
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
+More specifically, this makes the service behave as if it were in the default services list.
-.B
+.It Fl I | \-info
-.IP "\-i SERVICE,  \-\-init=SERVICE"
-Starts the specified SERVICE if it is not already running.  More specifically,
-this makes the service behave as if it were in the default services list.
-.B
-.IP "\-k SERVICE,  \-\-kill=SERVICE"
-Stop the specified SERVICE if it is running.  While this will kill the service
-right now, the service may be restarted immediately if other services depend
-on it (service is then started 'on-demand').  If the service used to be a 'default'
-service, its default-service status will be revoked.  If the
-service was not a default service, it will just be (temporarily) stopped,
-but could be re-started on-demand at any time.
-.B
-.IP "\-m, \-\-monitor"
-Monitor service activity of ARM.  In this mode, the command will not terminate
-until the user presses CTRL-C.
-.B
-.IP "\-s, \-\-start"
-Start all GNUnet default services on this system (and also ARM).  Naturally,
-if a service is demanded by a default service, it will then also be started.
-Running "gnunet-arm \-s" is the usual way to start a GNUnet peer.
-.B
-.IP "\-I, \-\-info"
 List all running services.
-.B
+.It Fl k Ar SERVICE | Fl \-kill= Ns Ar SERVICE
-.IP "\-v, \-\-version"
+Stop the specified SERVICE if it is running.
+While this will kill the service right now, the service may be restarted immediately if other services depend on it (service is then started 'on-demand').
+If the service used to be a 'default' service, its default-service status will be revoked.
+If the service was not a default service, it will just be (temporarily) stopped, but could be re-started on-demand at any time.
+.It Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME
+Write logs to FILENAME.
+.It Fl L Ar LOGLEVEL |  Fl \-loglevel= Ns Ar LOGLEVEL
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
+.It Fl m | \-monitor
+Monitor service activity of ARM.
+In this mode, the command will not terminate until the user presses CTRL-C.
+.It Fl O | \-no-stdout
+Don't let gnunet-arm inherit standard output
+.It Fl q | \-quiet
+Don't print status messages.
+.It Fl r | \-restart
+Stop and start all GNUnet default services.
+.It Fl s | \-start
+Start all GNUnet default services on this system (and also ARM).
+Naturally, if a service is demanded by a default service, it will then also be started.
+Running "gnunet-arm \-s" is the usual way to start a GNUnet peer.
+.It Fl T DELAY | \-timeout= Ns Ar DELAY
+Exit with error status if operation does not finish after DELAY
+.It Fl v | \-version
 Print GNUnet version number.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh EXAMPLES
-electronic mail to <gnunet\-developers@gnu.org>
+Start the gnunet-arm for the user:
-.SH SEE ALSO
+.Pp
-gnunet\-config(1), gnunet\-setup(1)
+.Dl gnunet-arm -s
-.PP
+.Pp
-The full documentation for
+Stop the gnunet-arm for the user:
-.B gnunet
+.Pp
-is maintained as a Texinfo manual.
+.Dl $ gnunet-arm -e
+.Sh SEE ALSO
+.Xr gnunet-config 1 ,
+.Xr gnunet-setup 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-ats.1 b/doc/man/gnunet-ats.1
index c098ed576..1e7b7731c 100644
--- a/doc/man/gnunet-ats.1
+++ b/doc/man/gnunet-ats.1
@@ -1,85 +1,110 @@
-.TH GNUNET\-ATS 1 "October 16, 2015" "GNUnet"
+.\" This file is part of GNUnet.
-.SH NAME
+.\" Copyright (C) 2001-2019 GNUnet e.V.
-gnunet\-ats \- display information about transport resource allocation
+.\"
-.SH SYNOPSIS
+.\" Permission is granted to copy, distribute and/or modify this document
-.B gnunet\-ats
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
-.RI [ options ]
+.\" any later version published by the Free Software Foundation; with no
-.br
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
-.SH DESCRIPTION
+.\" copy of the license is included in the file
-\fBgnunet\-ats\fP can be used to display information about the GNUnet's
+.\" ``FDL-1.3''.
-transport selection mechanism. It shows information about the
+.\"
-addresses and the assigned input and output bandwidth.
+.\" A copy of the license is also available from the Free Software
-.SH OPTIONS
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/fdl.html}.
-.B
+.\"
-.IP "\-a,  \-\-aa"
+.\" Alternately, this document is also available under the General
+.\" Public License, version 3 or later, as published by the Free Software
+.\" Foundation.  A copy of the license is included in the file
+.\" ``GPL3''.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/gpl.html}.
+.\"
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
+.\"
+.Dd October 16, 2015
+.Dt GNUNET-ATS 1
+.Os
+.Sh NAME
+.Nm gnunet-ats
+.Nd
+display information about transport resource allocation
+.Sh SYNOPSIS
+.Nm
+.Op Fl a | \-all
+.Op Fl C Ar PEERID | Fl \-connect= Ns Ar PEERID
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl h | \-help
+.Op Fl i Ar PEERID | Fl \-id= Ns Ar PEERID
+.Op Fl k Ar VALUE | Fl \-value= Ns Ar VALUE
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl m | \-monitor
+.Op Fl n | \-numeric
+.Op Fl p Ar PREFERENCE | Fl \-preference= Ns Ar PREFERENCE
+.Op Fl q | \-quotas
+.Op Fl t Ar TYPE | Fl \-type= Ns Ar TYPE
+.Op Fl u | \-used
+.Op Fl V | \-verbose
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+can be used to display information about the GNUnet's transport selection mechanism.
+It shows information about the addresses and the assigned input and output bandwidth.
+.Sh OPTIONS
+.Bl -tag -width Ds
+.It Fl a | \-all
 List all addresses currently known to ats.
-.B
+.It Fl C Ar PEERID | Fl \-connect= Ns Ar PEERID
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+Ask ATS to suggest an address for PEERID to transport to establish a connection.
+Note that you can use the gnunet-transport commandline tool to force disconnects.
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
+.It Fl h | \-help
-.IP "\-C, \-\-connect=PEERID"
-Ask ATS to suggest an address for PEERID to transport to establish a
-connection.
-Note that you can use the gnunet\-transport command\-line tool to
-force disconnects.
-.B
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl i Ar PEERID | Fl \-id= Ns Ar PEERID
-.IP "\-i, \-\-id=PEERID"
+Print information for a specific peer identity only.
-Print information for a specific peer identity only
+.It Fl k Ar VALUE | Fl \-value= Ns Ar VALUE
-.B
+Value to set for when changing preference values.
-.IP "\-k, \-\-value=VALUE"
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-Value to set for when changing preference values
-.B
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
+.It Fl m | \-monitor
-.IP "\-m, \-\-monitor"
+Monitor changes to the bandwidth assignments continuously.
-Monitor changes to the bandwidth assignments continuously
+.It Fl n | \-numeric
-.B
+Do not resolve IP addresses to hostnames.
-.IP "\-n, \-\-numeric"
+.It Fl p Ar PREFERENCE | Fl \-preference= Ns Ar PREFERENCE
-Do not resolve IP addresses to hostnames
+Set preference values, -i, -k and -t required.
-.B
+.It Fl q | \-quotas
-.IP "\-k, \-\-preference=E"
-Set preference values, \-i, \-k and \-t required
-.B
-.IP "\-q, \-\-quotas"
 Print quotas for all network types
-.B
+.It Fl t Ar TYPE | Fl \-type= Ns Ar TYPE
-.IP "\-t, \-\-type=VALUE"
 Preference type to change: latency | bandwidth
-.B
+.It Fl u | \-used
-.IP "\-u, \-\-used"
 Print addresses actively used only
-.B
+.It Fl V | \-verbose
-.IP "\-V, \-\-verbose"
 Print verbose output (include ATS address properties)
-.B
+.It v | \-version
-.IP "\-v, \-\-version"
 Print GNUnet version number.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh SEE ALSO
-electronic mail to <bug\-gnunet@gnu.org>
+.Xr gnunet-transport 1
-.SH SEE ALSO
+.sp
-gnunet\-transport(1)
+The full documentation for gnunet is maintained as a Texinfo manual.
-The full documentation for
+If the
-.B gnunet
+.Xr info 1
-is maintained as a Texinfo manual.  If the
+and gnunet programs are properly installed at your site, the command
-.B info
+.Pp
-and
+.Dl info gnunet
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.Pp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt bug-gnunet@gnu.org .
diff --git a/doc/man/gnunet-bcd.1 b/doc/man/gnunet-bcd.1
index 02b4397de..9b37a097b 100644
--- a/doc/man/gnunet-bcd.1
+++ b/doc/man/gnunet-bcd.1
@@ -13,19 +13,14 @@ installed.  If it does not work for you, try installing the full
 TeXLive distribution first, for example using the package\-manager
 apt: "apt-get install texlive-full".
 .SH OPTIONS
-.B
 .IP "\-p PORT, \-\-port=PORT"
 Run the HTTP server on port PORT.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-cadet.1 b/doc/man/gnunet-cadet.1
index 8404f085c..44d7fffca 100644
--- a/doc/man/gnunet-cadet.1
+++ b/doc/man/gnunet-cadet.1
@@ -21,42 +21,30 @@ For one\-to\-many communication \fBgnunet\-social\fP may be better
 suited, however.
 .SH SPECIFIC OPTIONS
-.B
 .IP "\-C CONNECTION_ID,  \-\-connection=CONNECTION_ID"
 Provide information about a particular connection.
-.B
 .IP "\-d,  \-\-dump"
 Dump debug information to STDERR.
-.B
 .IP "\-e,  \-\-echo"
 Activate echo mode.
-.B
 .IP "\-o SHARED_SECRET,  \-\-open-port=SHARED_SECRET"
 Listen for connections using a shared secret among sender and recipient.
-.B
 .IP "\-p PEER_ID,  \-\-peer=PEER_ID"
 Provide information about a patricular peer.
-.B
 .IP "\-P,  \-\-peers"
 Provide information about all peers.
-.B
 .IP "\-T,  \-\-tunnels"
 Provide information about all tunnels.
 .SH STANDARD OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
diff --git a/doc/man/gnunet-config.1 b/doc/man/gnunet-config.1
index f1443283f..8eca8de10 100644
--- a/doc/man/gnunet-config.1
+++ b/doc/man/gnunet-config.1
@@ -7,38 +7,28 @@ gnunet\-config \- manipulate GNUnet configuration files
 .SH DESCRIPTION
 \fBgnunet\-config\fP can be used to read or modify GNUnet configuration files.
 .SH OPTIONS
-.B
 .IP "\-f, \-\-filename"
-When accessing a specific option using \-s and \-o, perform expansions as if the
+Try to perform expansions as if the option values represent filenames (will
-value represents a filename.
+also be applied even if the option is not really a filename).
-.B
 .IP "\-s SECTION, \-\-section=SECTION"
 Which configuration section should be accessed or edited. Required option.
-.B
 .IP "\-S, \-\-list\-sections"
 List available configuration sections for use with \-\-section.
-.B
 .IP "\-W, \-\-rewrite"
 Consider differences to defaults only.
-.B
 .IP "\-o OPTION, \-\-option=OPTION"
 Which configuration option should be accessed or edited.  Required to set a value.
 If not given, all values of a given section will be printed in the
 format "OPTION = VALUE".
-.B
 .IP "\-V VALUE, \-\-value VALUE"
 Configuration value to store in the given section under the given option.
 Must only be given together with \-s and \-o options.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-conversation-test.1 b/doc/man/gnunet-conversation-test.1
index 5c08d3dab..477da5042 100644
--- a/doc/man/gnunet-conversation-test.1
+++ b/doc/man/gnunet-conversation-test.1
@@ -17,17 +17,13 @@ known to your computer).
 You can use gnunet\-conversation\-test without having a peer running
 on your computer.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-conversation.1 b/doc/man/gnunet-conversation.1
index 5925871da..3815b3887 100644
--- a/doc/man/gnunet-conversation.1
+++ b/doc/man/gnunet-conversation.1
@@ -15,25 +15,19 @@ your zone in the GNU Name System (using gnunet\-namestore).
 gnunet\-conversation has an interactive help system via the /help
 command.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-e NAME,  \-\-ego=NAME"
 Specifies the NAME of the ego to use (for caller ID).
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-p LINE,  \-\-phone=LINE"
 Optional argument that can be used to specify the phone LINE to be used with
 the conversation service.
 The default LINE is zero, which should be fine for most users.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-dns2gns.1 b/doc/man/gnunet-dns2gns.1
index 552df25b6..f61a0a8b3 100644
--- a/doc/man/gnunet-dns2gns.1
+++ b/doc/man/gnunet-dns2gns.1
@@ -1,60 +1,60 @@
-.TH GNUNET\-DNS2GNS 1 "March 5, 2018" "GNUnet"
+.Dd March 5, 2018
+.Dt GNUNET-DNS2GNS 1
-.SH NAME
+.Os
-gnunet\-dns2gns \- run a DNS-to-GNS proxy
+.Sh NAME
+.Nm gnunet-dns2gns
-.SH SYNOPSIS
+.Nd
-.B gnunet\-dns2gns
+run a DNS-to-GNS proxy
-.RI [ options ]
+.Sh SYNOPSIS
-.br
+.Nm
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.SH DESCRIPTION
+.Op Fl d Ar IP | Fl \-dns= Ns Ar IP
-Most users will not want to run an DNS to GNS proxy/gateway and thus will not
+.Op Fl h | \-help
-need this program.
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl v | \-version
-\fBgnunet\-dns2gns\fP runs a DNS resolver which delegates requests GNS if
+.Sh DESCRIPTION
-the TLD matches one configured for GNS.  All other requests are forwarded
+.Nm
-to DNS.  This DNS proxy is useful for enabling non-personalized
+runs a DNS resolver which delegates requests GNS if the TLD matches one configured for GNS.
-GNS\-resolution to an entire network or to offer GNS\-resolution to DNS users.
+All other requests are forwarded to DNS.
+This DNS proxy is useful for enabling non-personalized GNS\-resolution to an entire network or to offer GNS\-resolution to DNS users.
-.SH OPTIONS
+.Bl -tag -width Ds
-.B
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
+.It Fl d Ar IP | Fl \-dns= Ns Ar IP
-.IP "\-d IP,  \-\-dns=IP"
 IP address of a recursive DNS resolver that should be used for non-GADS hostnames.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
+Use LOGLEVEL for logging.
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
+Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
+.It Fl v | \-version
-.IP "\-v, \-\-version"
 Print GNUnet version number.
+.El
-.SH BUGS
+.Sh SEE ALSO
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Xr gnunet-gns-fcfs 1 ,
-electronic mail to <bug\-gnunet@gnu.org>
+.Xr gnunet-gns 1 ,
-.SH SEE ALSO
+.Xr gnunet-identity 1
-gnunet\-gns\-fcfs(1), gnunet\-gns(1), gnunet\-identity(1)
+.sp
-The full documentation for
+The full documentation for gnunet is maintained as a Texinfo manual.
-.B gnunet
+If the
-is maintained as a Texinfo manual.  If the
+.Xr info 1
-.B info
+and gnunet programs are properly installed at your site, the command
-and
+.Pp
-.B gnunet
+.Dl info gnunet
-programs are properly installed at your site, the command
+.Pp
-.IP
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-ecc.1 b/doc/man/gnunet-ecc.1
index aedc0bc49..2aa7743b2 100644
--- a/doc/man/gnunet-ecc.1
+++ b/doc/man/gnunet-ecc.1
@@ -17,33 +17,25 @@ take a while.  If the option \-p is given, the corresponding public
 key will be printed to the console.
 .SH OPTIONS
-.B
 .IP "\-g COUNT, \-\-generate-keys=COUNT"
 Create COUNT public-private key pairs and write them to FILENAME.
 Used for creating a file for testing.
-.B
 .IP "\-p, \-\-print-public-key"
 Print the corresponding public key to stdout.  This is the value used
 for PKEY records in GNS.
-.B
 .IP "\-P, \-\-print-private-key"
 Print the corresponding private key to stdout.  This is the value used
 for PKEY records in GNS.
-.B
 .IP "\-x, \-\-print-hex"
 Print the corresponding public key to stdout in HEX format.  Useful
 for comparing to Ed25519 keys in X.509 tools.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
diff --git a/doc/man/gnunet-gns-proxy-setup-ca.1 b/doc/man/gnunet-gns-proxy-setup-ca.1
new file mode 100644
index 000000000..54df856eb
--- /dev/null
+++ b/doc/man/gnunet-gns-proxy-setup-ca.1
@@ -0,0 +1,64 @@
+.Dd March 6, 2019
+.Dt GNUNET-GNS-PROXY-SETUP-CA 1
+.Os
+.Sh NAME
+.Nm gnunet-gns-proxy-setup-ca
+.Nd generate an X509 certificate for gnunet-gns-proxy and install it
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILE
+.\".Op Fl f Ar FILE
+.Op Fl h
+.Op Fl v
+.Op Fl V
+.Sh DESCRIPTION
+.Nm
+is a shell script to generate X509 certificates for your gnunet-gns-proxy and to install it for both GNUnet and your web browser.
+It currently supports Firefox and Chrome based browsers through the help of external helpers: certutil (nss) is used for the  import into webbrowsers, openssl is used to generated the CA.
+.Bl -tag -width Ds
+.It Fl c Ar FILE
+Use the configuration file FILE.
+.\" .It Fl f
+.\" Perform expansions of the variables used in the config value of gns-proxy.
+.\" This will usually expand $GNUNET_DATA_HOME to represents its path.
+.It Fl h
+Print short help on options
+.It Fl v
+Print the version
+.It Fl V
+be verbose
+.El
+.Sh FILES
+.Pa gnunet.conf
+.Sh SEE ALSO
+.Xr gnunet-gns 1 ,
+.Xr gnunet-gns-proxy 1 ,
+.Xr gnunet.conf 5
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Bd -literal -offset indent -compact
+        info gnunet
+.Ed
+should give you access to the complete handbook,
+.Bd -literal -offset indent -compact
+        info gnunet-c-tutorial
+.Ed
+will give you access to a tutorial for developers.
+.sp
+Depending on your installation, this information is also
+available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.Sh HISTORY
+This man page first appeared in GNUnet 0.11.1.
+.Sh AUTHORS
+This page was written by
+.An ng0 Aq Mt ng0@gnunet.org .
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt bug-gnunet@gnu.org .
diff --git a/doc/man/gnunet-gns-proxy.1 b/doc/man/gnunet-gns-proxy.1
index 6c12e2c09..603c5a28c 100644
--- a/doc/man/gnunet-gns-proxy.1
+++ b/doc/man/gnunet-gns-proxy.1
@@ -15,26 +15,20 @@ CA certificate has to be generated that is used by the proxy. Thus
 of this proxy or the \-\-authority switch is used to specify an
 appropriate CA certificate that is already trusted by the browser.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-a AUTHORITY,  \-\-authority=AUTHORITY"
 Path to a PEM CA file that contains the certificate and private key of
 the CA to use to assert the validity of GNS names. The default port is
 specified in the configuration file for the gns service under
 "[gns-proxy]" PROXY_CACERT.
-.B
 .IP "\-p PORT,  \-\-port=PORT"
 The port this proxy should listen on. Default is 7777.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-gns.1 b/doc/man/gnunet-gns.1
index 597297629..750c72d95 100644
--- a/doc/man/gnunet-gns.1
+++ b/doc/man/gnunet-gns.1
@@ -8,33 +8,26 @@ gnunet\-gns \- Access to GNU Name System
 \fBgnunet\-gns\fP can be used to lookup and process GNU Name Service
 names.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-r, \-\-raw"
 No unneeded output.
 This is a quiet mode where only important information is displayed.
 For example a lookup for an IP address will only yield the IP address,
 no descriptive text.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-u NAME, \-\-lookup=NAME"
 Name to lookup.
 Resolve the specified name using the GNU Name System.
-.B
 .IP "\-t TYPE, \-\-type=TYPE"
 Resource Record Type (TYPE) to look for.
 Supported TYPE's are: A, AAAA, CNAME, NS, PKEY, PSEU, TLSA, SRV, SOA,
 MX, LEHO, VPN, REV, PTR, TXT.
 Defaults to "A".
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH RETURN VALUE
diff --git a/doc/man/gnunet-namecache.1 b/doc/man/gnunet-namecache.1
index 78acb017b..06946e387 100644
--- a/doc/man/gnunet-namecache.1
+++ b/doc/man/gnunet-namecache.1
@@ -13,23 +13,17 @@ gnunet\-namecache \- inspect namecache
 namecache.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-n NAME, \-\-name=NAME"
 Name (label) of the record to display (mandatory option)
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
-.B
 .IP "\-z PKEY, \-\-zone=PKEY"
 Specifies the public key of the zone to inspect (mandatory option)
diff --git a/doc/man/gnunet-namestore-fcfsd.1 b/doc/man/gnunet-namestore-fcfsd.1
index a6c9d2b32..c1eca224f 100644
--- a/doc/man/gnunet-namestore-fcfsd.1
+++ b/doc/man/gnunet-namestore-fcfsd.1
@@ -27,20 +27,15 @@ pseudonym (using "gnunet\-identity \-C NAME"), and use it with the
 "-z" option.  After that, you can start the FCFSD service (possibly using
 gnunet\-arm).
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
-.B
 .IP "\-z EGO, \-\-zone=EGO"
 Specifies for which EGO should FCFSD manage the zone.
 .SH BUGS
diff --git a/doc/man/gnunet-namestore.1 b/doc/man/gnunet-namestore.1
index 7517a4f5e..6a824cc47 100644
--- a/doc/man/gnunet-namestore.1
+++ b/doc/man/gnunet-namestore.1
@@ -12,13 +12,10 @@ gnunet\-namestore \- manipulate GNU Name System (GNS) zone data
 \fBgnunet\-namestore\fP can be used to manipulate records in a GNS zone.
 .SH OPTIONS
-.B
 .IP "\-a, \-\-add"
 Desired operation is adding a record
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-d, \-\-delete"
 Desired operation is deleting records under the given name that match
 the specified type (\-t) and value (\-V).  If type or value are not
@@ -26,41 +23,31 @@ specified, it means that all types (or values) should be assumed to
 match (and possibly multiple or all values under the given label will
 be deleted).  Specifying a label (\-n) is mandatory.  Note that
 matching by expiration time or flags is (currently) not supported.
-.B
 .IP "\-D, \-\-display"
 Desired operation is listing of matching records
-.B
 .IP "\-e TIME, \-\-expiration=TIME"
 Specifies expiration time of record to add; format is relative time,
 i.e "1 h" or "7 d 30 m".  Supported units are "ms", "s", "min" or
 "minutes", "h" (hours), "d" (days) and "a" (years).
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-i NICKNAME, \-\-nick=NICKNAME"
 Set the desired NICKNAME for the zone. The nickname will be included
 in all (public) records and used as the suggested name for this zone.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-m, \-\-monitor"
 Monitor changes to the zone on an ongoing basis (in contrast to \-D,
 which merely displays the current records)
-.B
 .IP "\-n NAME, \-\-name=NAME"
 Label or name of the record to add/delete/display
-.B
 .IP "\-p, \-\-public"
 Create a record that is public (shared with other users that know the
 label)
-.B
 .IP "\-r PKEY, \-\-reverse=PKEY"
 Determine our GNS name for the given public key (reverse lookup of the
 PKEY) in the given zone.
-.B
 .IP "\-R RECORDLINE, \-\-replace=RECORDLINE"
 Sets record set to values given in RECORDLINE.  This option can be specified multiple
 times to provide multiple records for the record set.  Existing records under the
@@ -69,29 +56,23 @@ same label will be deleted. The format for the RECORDLINE is
 be given explicitly, seconds is always implied), TYPE is the
 DNS/GNS record type, FLAGS is "(N)ORMAL", "(S)HADOW" or "(P)UBLIC".  The VALUE
 follows the usual human-readable value format(s) of DNS/GNS.
-.B
 .IP "\-s, \-\-shadow"
 Create a record that is a shadow record.  Shadow records are only used
 once all other records of the same type under the same label have
 expired.
-.B
 .IP "\-t TYPE, \-\-type=TYPE"
 Type of the record to add/delete/display (i.e. "A", "AAAA", "NS",
 "PKEY", "MX" etc.)
-.B
 .IP "\-u URI, \-\-uri=URI"
 Add PKEY record from gnunet://gns/-URI to our zone; the record type is
 always PKEY, if no expiration is given FOREVER is used
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
-.B
 .IP "\-V VALUE, \-\-value=VALUE"
 Value to store or remove from the GNS zone.  Specific format depends
 on the record type.  A records expect a dotted decimal IPv4 address,
 AAAA records an IPv6 address, PKEY a public key in GNUnet's printable
 format, and CNAME and NS records should be a domain name.
-.B
 .IP "\-z EGO, \-\-zone=EGO"
 Specifies the name of the ego controlling the private key for the zone
 (mandatory option)
diff --git a/doc/man/gnunet-nat-auto.1 b/doc/man/gnunet-nat-auto.1
index 8514a5c99..efd4b5df1 100644
--- a/doc/man/gnunet-nat-auto.1
+++ b/doc/man/gnunet-nat-auto.1
@@ -8,22 +8,17 @@ gnunet\-nat\-auto \- autoconfigure and test NAT traversal
 This tool allows testing various NAT traversal functions, as well
 as attempting auto\-configuration.
 .SH OPTIONS
-.B
 .IP "\-a,  \-\-auto"
 Attempt auto\-configuration for NAT traversal.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-S NAME,  \-\-section=NAME"
 Name of the configuration section with details about the configuration
 to test. For example "transport-tcp".
 .IP "\-t,  \-\-tcp"
 Use TCP.
-.B
 .IP "\-u,  \-\-udp"
 Use UDP.
-.B
 .IP "\-w,  \-\-write"
 Write configuration to configuration file, useful in combination with
 autoconfiguration (\-a).
diff --git a/doc/man/gnunet-nat-server.1 b/doc/man/gnunet-nat-server.1
index f31e69b26..8cb995f7c 100644
--- a/doc/man/gnunet-nat-server.1
+++ b/doc/man/gnunet-nat-server.1
@@ -41,7 +41,6 @@ gnunet\-nat\-server is run on should be specified in the NATSERVER
 option in the [setup] section of the configuration file of hosts that
 are supposed to autoconfigure with this server.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
 .SH BUGS
diff --git a/doc/man/gnunet-nat.1 b/doc/man/gnunet-nat.1
index 4a6a56e97..fe9272ea5 100644
--- a/doc/man/gnunet-nat.1
+++ b/doc/man/gnunet-nat.1
@@ -8,38 +8,28 @@ gnunet\-nat \- interact with the NAT service
 This tool allows testing various NAT traversal functions, as well as
 attempting auto\-configuration.
 .SH OPTIONS
-.B
 .IP "\-b ADDRESS,  \-\-bind=ADDRESS"
 Assume that the service is (locally) bound to ADDRESS.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-e ADDRESS,  \-\-external=ADDRESS"
 Assume that ADDRESS is the globally visible address of the peer.
-.B
 .IP "\-i ADDRESS,  \-\-in=ADDRESS"
 Assuming we are listening at ADDRESS for connection reversal requests.
-.B
 .IP "\-r ADDRESS,  \-\-remote=ADDRESS"
 Ask the peer at ADDRESS for connection reversal, using the local
 address for the target address of the reversal.
-.B
 .IP "\-S NAME,  \-\-section=NAME"
 Name of section in configuration file to use for additional options.
-.B
 .IP "\-s,  \-\-stun"
 Enable processing of STUN requests.
 Will try to read UDP packets from the bind address and handle the
 packets if they are STUN packets.
 Will only work with UDP.
-.B
 .IP "\-t,  \-\-tcp"
 Use TCP.
-.B
 .IP "\-u,  \-\-udp"
 Use UDP.
-.B
 .IP "\-W,  \-\-watch"
 Watch for connection reversal requests.
 .SH EXAMPLES
diff --git a/doc/man/gnunet-nse.1 b/doc/man/gnunet-nse.1
new file mode 100644
index 000000000..151ba4957
--- /dev/null
+++ b/doc/man/gnunet-nse.1
@@ -0,0 +1,65 @@
+.Dd March 6, 2019
+.Dt GNUNET-NSE 1
+.Os
+.Sh NAME
+.Nm gnunet-nse
+.Nd show network size estimates from NSE service
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar file | Fl -config Ns = Ns file
+.Op Fl h | \-help
+.Op Fl l file | Fl -logfile Ns = Ns file
+.Op Fl L Ar loglevel | Fl -loglevel Ns = Ns loglevel
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+is a command line tool to show network size estimates from the NSE service of GNUnet.
+.Bl -tag -width Ds
+.It Fl c Ar file | Fl -config Ns = Ns file
+Use the configuration file FILENAME.
+.It Fl h | \-help
+Print short help on options.
+.It Fl l file | Fl -logfile Ns = Ns file
+Configure logging to write logs to LOGFILE.
+.It Fl L Ar loglevel | Fl -loglevel Ns = Ns loglevel
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
+.It Fl v | \-version
+Print GNUnet version number.
+.El
+.Sh FILES
+.Pa gnunet.conf
+Configuration file for gnunet.
+.Sh SEE ALSO
+.Xr gnunet.conf 5
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+gnunet programs are properly installed at your site, the command
+.Bd -literal -offset indent -compact
+        info gnunet
+.Ed
+should give you access to the complete handbook,
+.Bd -literal -offset indent -compact
+        info gnunet-c-tutorial
+.Ed
+will give you access to a tutorial for developers.
+.sp
+Depending on your installation, this information is also
+available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.Sh HISTORY
+This man page first appeared in GNUnet 0.11.1.
+.Sh AUTHORS
+This page was originally written by
+.An Bertrand Marc Aq Mt bmarc@debian.org
+for Debian's gnunet package (man page date: 2014).
+Further edits and conversion to mdoc were done by
+.An ng0 Aq Mt ng0@gnunet.org .
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt bug-gnunet@gnu.org .
diff --git a/doc/man/gnunet-peerinfo.1 b/doc/man/gnunet-peerinfo.1
index bd37fa635..88094fa10 100644
--- a/doc/man/gnunet-peerinfo.1
+++ b/doc/man/gnunet-peerinfo.1
@@ -8,39 +8,28 @@ gnunet\-peerinfo \- Display information about other peers.
 .PP
 \fBgnunet\-peerinfo\fP display the known addresses and trust of known peers.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME, \-\-config=FILENAME"
 Load config file (default: ~/.config/gnunet.conf)
-.B
 .IP "\-g, \-\-get\-hello"
 Output HELLO uri(s)
-.B
 .IP "\-h, \-\-help"
 Print help page
-.B
 .IP "\-i, \-\-info"
 List all known peers (and their addresses)
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Set the loglevel
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Log messages to LOGFILE
-.B
 .IP "\-n, \-\-numeric"
 Disable resolution of IPs to hostnames
-.B
 .IP "\-p, \-\-put\-hello=HELLO"
 Add given HELLO uri to the database
-.B
 .IP "\-q, \-\-quiet"
 Do not print anything but the peer identities
-.B
 .IP "\-s, \-\-self"
 Print only our own identity (together with "\-q", this is the exact
 line that other peers would have to put in to their friends file in
 order to consider this peer one of their friends in F2F mode).
-.B
 .IP "\-v, \-\-version"
 Print the version number
 .SH BUGS
diff --git a/doc/man/gnunet-publish.1 b/doc/man/gnunet-publish.1
index b07208732..5f774580b 100644
--- a/doc/man/gnunet-publish.1
+++ b/doc/man/gnunet-publish.1
@@ -112,9 +112,9 @@ default is ~/.config/gnunet.conf).
 Disable use of GNU libextractor for finding additional keywords and
 metadata.
 .TP
-\fB\-d\fR, \fB\-\-disable\-creation\-time\fR
+\fB\-E\fR, \fB\-\-enable\-creation\-time\fR
-Disable use of creation time timestamp in metadata.
+Enable use of creation time timestamp in metadata.
-Useful to make created directories deterministic and to avoid leaking
+Setting this information will leak
 information about the time at which a file was made available.
 .TP
 \fB\-e\fR, \fB\-\-extract\fR
diff --git a/doc/man/gnunet-qr.1 b/doc/man/gnunet-qr.1
index 0145a3523..2aabe6b22 100644
--- a/doc/man/gnunet-qr.1
+++ b/doc/man/gnunet-qr.1
@@ -1,49 +1,53 @@
-.TH GNUNET\-QR 1 "September 13, 2014" "GNUnet"
+.Dd September 13, 2014
-.SH NAME
+.Dt GNUNET-QR 1
-gnunet\-qr \- Scan a QR code using a video device and import.
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-qr
+.Nm gnunet-qr
-.RI [ options ]
+.Nd
-.br
+scan a QR code using a video device and import
-.SH DESCRIPTION
+.Sh SYNOPSIS
-\fBgnunet\-qr\fP is a command line tool to scan a QR code using a
+.Nm
-video device and import.
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.SH OPTIONS
+.Op Fl d Ar DEVICE | Fl \-device= Ns Ar DEVICE
-.B
+.Op Fl h | \-help
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Op Fl s | \-silent
+.Op Fl v | \-verbose
+.Sh DESCRIPTION
+.Nm
+is a command line tool to scan a QR code using a video device and import.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
+.It Fl d Ar DEVICE | Fl \-device= Ns Ar DEVICE
-.IP "\-d DEVICE,  \-\-device=DEVICE"
 Use device DEVICE.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl s | \-silent
-.IP "\-s,  \-\-silent"
 Do not show preview windows.
-.B
+.It Fl v | \-verbose
-.IP "\-v, \-\-verbose"
 Be verbose.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh SEE ALSO
-electronic mail to <gnunet\-developers@gnu.org>
+The full documentation for gnunet is maintained as a Texinfo manual.
-.SH SEE ALSO
+If the
-The full documentation for
+.Xr info 1
-.B gnunet
+and gnunet programs are properly installed at your site, the command
-is maintained as a Texinfo manual.  If the
+.Pp
-.B info
+.Dl info gnunet
-and
+.Pp
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-resolver.1 b/doc/man/gnunet-resolver.1
index 66f1ba9a8..494131d01 100644
--- a/doc/man/gnunet-resolver.1
+++ b/doc/man/gnunet-resolver.1
@@ -7,23 +7,17 @@ gnunet\-resolver \- build-in GNUnet stub resolver
 .SH DESCRIPTION
 \fBgnunet\-resolver\fP uses build-in GNUnet stub resolver.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
 .IP "\-r, \-\-reverse"
 Perform a reverse lookup.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-revocation.1 b/doc/man/gnunet-revocation.1
index f21f82612..6fae373e7 100644
--- a/doc/man/gnunet-revocation.1
+++ b/doc/man/gnunet-revocation.1
@@ -28,19 +28,15 @@ expensive.  Depending on your CPU, the calculation can take days or
 weeks.
 .SH OPTIONS
-.B
 .IP "\-t KEY, \-\-test=KEY"
 Check if the given KEY (ASCII\-encoded public key required) has been
 revoked.
-.B
 .IP "\-R NAME, \-\-revoke=NAME"
 Calculate or perform revocation for the ego with the given NAME.
-.B
 .IP "\-p, \-\-perform"
 Actually perform the revocation as soon as possible (do not just
 generate a revocation certificate, use it).  Must be supplied to
 actually perform the revocation.
-.B
 .IP "\-f NAME, \-\-filename=NAME"
 Use NAME as the name of the file that is to contain the revocation
 certificate.  Intermediate computation results will be stored here, as
@@ -51,17 +47,13 @@ be performed instantly.  If the given file contains anything (a valid
 certificate, with or without the completed proof-of-work) there is no
 need to supply the "\-R" option or to still have the private key of
 the ego to perform the revocation.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
diff --git a/doc/man/gnunet-scalarproduct.1 b/doc/man/gnunet-scalarproduct.1
index 1c8938daf..34d5e4ef0 100644
--- a/doc/man/gnunet-scalarproduct.1
+++ b/doc/man/gnunet-scalarproduct.1
@@ -42,34 +42,26 @@ The protocol by definition relies on \fBAlice\fP and \fBBob\fP being
 benign, thus \fBBob\fP can arbitrarily falsify his information. Both
 peers collaborate to achieve a correct result.
 .SH OPTIONS
-.B
 .IP "\-e ELEMENTS, \-\-elements=ELEMENTS"
 The element-vector the vectorproduct should be computed over in signed
 decimal form, eg: \"42,1,-3,3,7\". Zero value elements will be automatically masked.
-.B
 .IP "\-m MASK, \-\-mask=MASK"
 Elements in the vector can be masked. There must be at least two
 elements left in the vector to compute a vectorproduct. Non-Zero
 values indicate an element is not maskes.
-.B
 .IP "\-k KEY, \-\-key=KEY"
 The session key, a shared string of arbitrary length from which the
 SID will be generated
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-p PEERID, \-\-peer=PEERID"
 The remote peer\'s ASCII-armored gnunet-peer ID as output by
 gnunet-peerinfo. If this option is not given, the peer will take the
 \fBBob\fP\'s role.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-scrypt.1 b/doc/man/gnunet-scrypt.1
index 01ac4205a..545af37e9 100644
--- a/doc/man/gnunet-scrypt.1
+++ b/doc/man/gnunet-scrypt.1
@@ -5,34 +5,24 @@ gnunet\-scrypt \- Manipulate GNUnet proof of work files.
 .B gnunet\-scrypt
 .RI [ options ]
 .SH DESCRIPTION
-\fBgnunet\-scrypt\fP is a command line tool to manipulate GNUnet proof
+\fBgnunet\-scrypt\fP is a command line tool to manipulate GNUnet proof of work files.
-of work files.
 .SH OPTIONS
-.B
 .IP "\-b BITS,  \-\-bits=BITS"
 Number of bits to require for the proof of work.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-k FILE, \-\-keyfile=FILE"
 File with private key, otherwise default is used.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
 .IP "\-o FILE, \-\-outfile=FILE"
 File with proof of work, otherwise default is used.
-.B
 .IP "\-t TIME, \-\-timeout=TIME"
 Time to wait between calculations.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-statistics.1 b/doc/man/gnunet-statistics.1
index e61a8493c..c0d5e8fe3 100644
--- a/doc/man/gnunet-statistics.1
+++ b/doc/man/gnunet-statistics.1
@@ -1,73 +1,91 @@
-.TH GNUNET-STATISTICS 1 "January 4, 2012" "GNUnet"
+.Dd January 4, 2012
-.SH NAME
+.Dt GNUNET-STATISTICS 1
-gnunet\-statistics \- Display statistics about your GNUnet system
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-statistics
+.Nm gnunet-statistics
-.RI [ options ]
+.Nd display statistics about your GNUnet system
-.RI [ VALUE ]
+.Sh SYNOPSIS
-.SH DESCRIPTION
+.Nm
-\fBgnunet\-statistics\fP is used to display detailed information about
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-various aspect of GNUnet's operation.  This tool only works if the
+.Op Fl h | \-help
-"statistics" service is available.
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-gnunet\-statistics can be used to set a value by giving the options
+.Op Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME
-\-n, \-s and also a VALUE.
+.Op Fl n Ar NAME | Fl \-name= Ns Ar NAME
-.SH OPTIONS
+.Op Fl o Ar PORT | Fl \-port= Ns Ar PORT
-.B
+.Op Fl p | \-persistent
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Op Fl q | \-quiet
+.Op Fl r Ar REMOTE | Fl \-remote= Ns Ar REMOTE
+.Op Fl S Ar SEPARATOR | Fl \-csv-separator= Ns Ar SEPARATOR
+.Op Fl s Ar SUBSYSTEM | Fl \-subsystem= Ns Ar SUBSYSTEM
+.Op Fl t Ar PATH | Fl \-testbed= Ns Ar PATH
+.Op Fl v | \-version
+.Op Fl w | \-watch
+.Ao Ar VALUE Ac
+.Sh DESCRIPTION
+.Nm
+is used to display detailed information about various aspect of GNUnet's operation.
+This tool only works if the "statistics" service is available.
+gnunet-statistics can be used to set a value by giving the options \-n, \-s and also a VALUE.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
+.It Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME
-.IP "\-n NAME,  \-\-name=NAME"
+Configure logging to write logs to FILENAME
-Each statistic has a name that is unique with in its subsystem.  With
+.It Fl n Ar NAME | Fl \-name= Ns Ar NAME
-this option, the output can be restricted to statistics that have a
+Each statistic has a NAME that is unique with in its subsystem.
-particular name.
+With this option, the output can be restricted to statistics that have a particular NAME.
-.B
+.It Fl o Ar PORT | Fl \-port= Ns Ar PORT
-.IP "\-p,  \-\-persistent"
+PORT for remote host
-When setting a value, make the value persistent.  If the value used to
+.It Fl p | \-persistent
-be persistent and this flag is not given, it will be marked as
+When setting a value, make the value persistent.
-non\-persistent.
+If the value used to be persistent and this flag is not given, it will be marked as non-persistent.
-.B
+.It Fl q | \-quiet
-.IP "\-s SUBSYSTEM,  \-\-subsystem=SUBSYSTEM"
+Just print the statistics value
-Statistics are kept for various subsystems.  With this option, the
+.It Fl r Ar REMOTE | Fl \-remote= Ns Ar REMOTE
-output can be restricted to a particular subsystem only.
+Connect to a remote host given as REMOTE.
-.B
+.It Fl S Ar SEPARATOR | Fl \-csv-separator= Ns Ar SEPARATOR
-.IP "\-S SEPARATOR,  \-\-csv-separator=SEPARATOR"
 Specify a separator for generating csv-output.
-.B
+.It Fl s Ar SUBSYSTEM | Fl \-subsystem= Ns Ar SUBSYSTEM
-.IP "\-t TESTBED_PATH,  \-\-subsystem=TESTBED_PATH"
+Statistics are kept for various subsystems.
+With this option, the output can be restricted to a particular subsystem only.
+.It Fl t Ar PATH | Fl \-testbed= Ns Ar PATH
 When running testbed, you can get statistics of all peers with specefying the
-folder containing the data of all testbed nodes like \fBgnunet\-statistics -t /tmp/testbedARtmQv\fP.
+folder containing the data of all testbed nodes like
-.B
+.Pp
-.IP "\-v, \-\-version"
+.Dl $ gnunet-statistics -t /tmp/testbedARtmQv
+.Pp
+.It Fl v | \-version
 Print GNUnet version number.
-.SH BUGS
+.It Fl w | \-watch
-Report bugs by using Mantis <https://gnunet.org/mantis/> or by sending
+Watch value continuously.
-electronic mail to <gnunet\-developers@gnu.org>
+.El
-.SH SEE ALSO
+.Sh SEE ALSO
-gnunet\-service\-statistics(1)
+.Xr gnunet-service-statistics 1
-.PP
+.sp
-The full documentation for
+The full documentation for gnunet is maintained as a Texinfo manual.
-.B gnunet
-is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-testbed-profiler.1 b/doc/man/gnunet-testbed-profiler.1
index b1dde99dd..fe9d713b3 100644
--- a/doc/man/gnunet-testbed-profiler.1
+++ b/doc/man/gnunet-testbed-profiler.1
@@ -1,61 +1,67 @@
-.TH GNUNET\-TESTBED\-PROFILER 1 "September 13, 2014" "GNUnet"
+.Dd September 13, 2014
-.SH NAME
+.Dt GNUNET-TESTBED-PROFILER 1
-gnunet\-testbed\-profiler \- Profiling driver for the testbed.
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-testbed\-profiler
+.Nm gnunet-testbed-profiler
-.RI [ options ]
+.Nd
-.br
+profiling driver for the testbed
-.SH DESCRIPTION
+.Sh SYNOPSIS
-\fBgnunet\-testbed\-profiler\fP is a command line profiling driver for the testbed.
+.Nm
-.SH OPTIONS
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.B
+.Op Fl e Ar COUNT | Fl \-num-errors= Ns Ar COUNT
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Op Fl H Ar FILENAME |  Fl \-hosts= Ns Ar FILENAME
+.Op Fl h | \-help
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl l Ar LOGFILE |  Fl \-logfile= Ns Ar LOGFILE
+.Op Fl n | \-non-interactive
+.Op Fl p Ar COUNT | Fl \-num-peers= Ns Ar COUNT
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+is a command line profiling driver for the testbed.
+.Sh OPTIONS
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
+.It Fl e Ar COUNT | Fl \-num-errors= Ns Ar COUNT
-.IP "\-e COUNT,  \-\-num\-errors=COUNT"
 Tolerate COUNT number of continious timeout failures.
-.B
+.It Fl H Ar FILENAME |  Fl \-hosts= Ns Ar FILENAME
-.IP "\-H FILENAME,  \-\-hosts=FILENAME"
 Name of the file with the login information for the testbed.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
+Use LOGLEVEL for logging.
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
+Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
+.It Fl l Ar LOGFILE |  Fl \-logfile= Ns Ar LOGFILE
-.IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
+.It Fl n | \-non-interactive
-.IP "\-n, \-\-non\-interactive"
+Run profiler in non-interactive mode where upon testbed setup the profiler does not wait for a keystroke but continues to run until a termination signal is received.
-Run profiler in non-interactive mode where upon testbed setup the
+.It Fl p Ar COUNT | Fl \-num-peers= Ns Ar COUNT
-profiler does not wait for a keystroke but continues to run until a
-termination signal is received.
-.B
-.IP "\-p COUNT, \-\-num\-peers=COUNT"
 Create COUNT number of peers.
-.B
+.It Fl v | \-version
-.IP "\-v, \-\-version"
 Print GNUnet version number.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+.Sh SEE ALSO
-.SH "SEE ALSO"
+The full documentation for gnunet is maintained as a Texinfo manual.
-The full documentation for
+If the
-.B gnunet
+.Xr info 1
-is maintained as a Texinfo manual.  If the
+and gnunet programs are properly installed at your site, the command
-.B info
+.Pp
-and
+.Dl info gnunet
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-testing-run-service.1 b/doc/man/gnunet-testing-run-service.1
index 43fdb8ecf..903810c7f 100644
--- a/doc/man/gnunet-testing-run-service.1
+++ b/doc/man/gnunet-testing-run-service.1
@@ -1,52 +1,53 @@
-.TH GNUNET-TESTING-RUN-SERVICE 1 "August 25, 2013" "GNUnet"
+.Dd August 25, 2013
-.SH NAME
+.Dt GNUNET-TESTING-RUN-SERVICE 1
-gnunet\-testing\-run\-service \- Command line tool to start a service for testing.
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-testing\-run\-service
+.Nm gnunet-testing-run-service
-.RI [ options ]
+.Nd
-.SH DESCRIPTION
+command line tool to start a service for testing
-\fBgnunet\-testing\-run\-service\fP is a command line tool to start a
+.Sh SYNOPSIS
-service for testing. It starts a peer, running only the service
+.Nm
-specified on the command line, outputs the path to the temporary
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-configuration file to stdout.
+.Op Fl h | \-help
-.PP
+.Op Fl s Ar SERVICE | Fl \-service= Ns Ar SERVICE
-The peer will run until this program is killed, or stdin is
+.Sh DESCRIPTION
-closed. When reading the character 'r' from stdin, the running service
+.Nm
-is restarted with the same configuration.
+is a command line tool to start a service for testing.
-.PP
+It starts a peer, running only the service specified on the command line, outputs the path to the temporary configuration file to stdout.
-This executable is intended to be used by gnunet-java, in order to
+.Pp
-reliably start and stop services for test cases.
+The peer will run until this program is killed, or stdin is closed.
-.SH OPTIONS
+When reading the character 'r' from stdin, the running service is restarted with the same configuration.
-.B
+.Pp
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+This executable is intended to be used by gnunet-java, in order to reliably start and stop services for test cases.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Name of the template configuration file to use (optional).
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl s Ar SERVICE | Fl \-service= Ns Ar SERVICE
-.IP "\-s SERVICE, \-\-service=SERVICE"
 Name of the service to run.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh SEE ALSO
-electronic mail to <gnunet\-developers@gnu.org>
+The full documentation for gnunet is maintained as a Texinfo manual.
-.SH SEE ALSO
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-testing.1 b/doc/man/gnunet-testing.1
index 357d0df44..182da613d 100644
--- a/doc/man/gnunet-testing.1
+++ b/doc/man/gnunet-testing.1
@@ -1,65 +1,69 @@
-.TH GNUNET\-TESTING 1 "January 4, 2012" "GNUnet"
+.Dd January 4, 2012
-.SH NAME
+.Dt GNUNET-TESTING 1
-gnunet\-testing \- Command line tool to access the testing library.
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-testing
+.Nm gnunet-testing
-.RI [ options ]
+.Nd
-.br
+command line tool to access the testing library
-.SH DESCRIPTION
+.Sh SYNOPSIS
-\fBgnunet\-testing\fP is a command line tool to access the testing
+.Nm
-library.
+.Op Fl C | \-cfg
-.SH OPTIONS
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.B
+.Op Fl H | \-hostkeys
-.IP "\-C,  \-\-cfg"
+.Op Fl h | \-help
+.Op Fl k | \-key
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOFILE
+.Op Fl n | \-number
+.Op Fl t | \-template
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+is a command line tool to access the testing library.
+.Sh OPTIONS
+.Bl -tag -width Ds
+.It Fl C | \-cfg
 Create unique configuration files.
-.B
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
+.It Fl H | \-hostkeys
-.IP "\-H, \-\-hostkeys"
 Host key file.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl k | \-key
-.IP "\-k, \-\-key"
 Create hostkey files from pre-computed hostkey list.
-.B
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
+.It Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOFILE
-.IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
+.It Fl n | \-number
-.IP "\-n, \-\-number"
 Number of unique configuration files or hostkeys to create.
-.B
+.It Fl t | \-template
-.IP "\-t, \-\-template"
 Configuration template.
-.B
+.It Fl v | \-version
-.IP "\-v, \-\-version"
 Print GNUnet version number.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh SEE ALSO
-electronic mail to <gnunet\-developers@gnu.org>
+The full documentation for gnunet is maintained as a Texinfo manual.
-.SH SEE ALSO
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-timeout.1 b/doc/man/gnunet-timeout.1
index 653f211cd..15abfe351 100644
--- a/doc/man/gnunet-timeout.1
+++ b/doc/man/gnunet-timeout.1
@@ -1,36 +1,42 @@
-.TH GNUNET-TIMOUET 1 "June 5, 2018" "GNUnet"
+.Dd June 5, 2018
-.SH NAME
+.Dt GNUNET-TIMEOUT 1
-gnunet\-timeout \- run process with timeout
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-timeout
+.Nm gnunet-timeout
-.RI TIMEOUT PROGRAM ARGS
+.Nd
-.SH DESCRIPTION
+run process with timeout
-\fBgnunet\-timeout\fP can be used to run another process with a
+.Sh SYNOPSIS
-timeout.  Provided as the standard "timout" utility may not be
+.Nm
-available on all platforms.
+.Ao Ar duration Ac
-.SH BUGS
+.Ao Ar command Ac
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Ao args ... Ac
-electronic mail to <gnunet\-developers@gnu.org>
+.Sh DESCRIPTION
-.SH SEE ALSO
+.Nm
-timeout(1)
+can be used to run another process with a timeout.
-.PP
+It is provided because the standard "timout" utility may not be available on all platforms.
-The full documentation for
+.Sh SEE ALSO
-.B gnunet
+.Xr timeout 1
-is maintained as a Texinfo manual.
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-transport-certificate-creation.1 b/doc/man/gnunet-transport-certificate-creation.1
index 9dc572acf..e896363e4 100644
--- a/doc/man/gnunet-transport-certificate-creation.1
+++ b/doc/man/gnunet-transport-certificate-creation.1
@@ -1,35 +1,40 @@
-.TH GNUNET\-TRANSPORT-CERTIFICATE-CREATION 1 "January 31, 2014" "GNUnet"
+.Dd January 31, 2014
-.SH NAME
+.Dt GNUNET-TRANSPORT-CERTIFICATE-CREATION 1
-gnunet\-transport\-certificate\-creation \- create certificate for HTTPS transport
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-transport\-certificate\-creation
+.Nm gnunet-transport-certificate-creation
-.I privatekey certificate
+.Nd
-.SH DESCRIPTION
+create certificate for HTTPS transport
-\fBgnunet\-transport\-certificate\-creation\fP uses openssl to generate a RSA
+.Sh SYNOPSIS
-private key and then a self-signed certificate for HTTPS transport.
+.Nm
-.SH BUGS
+.Op privatekey
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Op certificate
-electronic mail to <gnunet\-developers@gnu.org>
+.Sh DESCRIPTION
-.SH SEE ALSO
+.Nm
-gnunet\-transport(1)
+uses openssl to generate a RSA private key and then a self-signed certificate for HTTPS transport.
-.PP
+.Sh SEE ALSO
-The full documentation for
+.Xr gnunet-transport 1
-.B gnunet
+.sp
-is maintained as a Texinfo manual.
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-transport.1 b/doc/man/gnunet-transport.1
index eef762174..f5ed47ad1 100644
--- a/doc/man/gnunet-transport.1
+++ b/doc/man/gnunet-transport.1
@@ -1,84 +1,92 @@
-.TH GNUNET\-TRANSPORT "1" "October 17, 2015" "GNUnet"
+.Dd October 17, 2015
-.SH NAME
+.Dt GNUNET-TRANSPORT 1
-gnunet\-transport \- measure and control the transport subsystem
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-transport
+.Nm gnunet-transport
-[\fIOPTIONS\fR]
+.Nd
-.SH DESCRIPTION
+measure and control the transport subsystem
-.PP
+.Sh SYNOPSIS
-gnunet\-transport is a tool to access various functions of GNUnet's
+.Nm
-transport subsystem from the command\-line.  Most of these are not
+.Op Fl b | \-benchmark
-expected to be useful for end-users.  gnunet\-transport can be used to
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-evaluate the performance of the transports, force a peer to connect to
+.Op Fl D | \-disconnect
-another peer (if possible).  Other functions should be added in the
+.Op Fl e | \-events
-near future.
+.Op Fl h | \-help
-.TP
+.Op Fl i | \-information
-\fB\-b\fR, \fB\-\-benchmark\fR
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-measure how fast we are receiving data (from all connections).  On
+.Op Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOGFILE
-exit, the data rate will be reported.  Runs until aborted with CTRL-C.
+.Op Fl m | \-monitor
-.TP
+.Op Fl p Ar PEER | Fl \-peer= Ns Ar PEER
-\fB\-D\fR, \fB\-\-disconnect\fR
+.Op Fl P | \-plugins
-force disconnection from a peer (used in conjunction with \-p).
+.Op Fl s | \-send
-Note that you can use the gnunet\-ats command\-line tool to suggest connects.
+.Op Fl v | \-version
-.TP
+.Op Fl V | \-verbose
-\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
+.Sh DESCRIPTION
+.Nm
+is a tool to access various functions of GNUnet's transport subsystem from the command-line.
+Most of these are not expected to be useful for end-users.
+gnunet-transport can be used to evaluate the performance of the transports, force a peer to connect to another peer (if possible).
+Other functions should be added in the near future.
+.Bl -tag -width Ds
+.It Fl b | \-benchmark
+measure how fast we are receiving data (from all connections).
+On exit, the data rate will be reported.
+Runs until aborted with CTRL-C.
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 configuration file to use
-.TP
+.It Fl D | \-disconnect
-\fB\-e \fB\-\-events\fR
+force disconnection from a peer (used in conjunction with \-p).
+Note that you can use the gnunet-ats command-line tool to suggest connects.
+.It Fl e | \-events
 provide information about all connect and disconnect events (continuously)
-.TP
+.It Fl h | \-help
-\fB\-h\fR, \fB\-\-help\fR
 print help page
-.TP
+.It Fl i | \-information
-\fB\-i\fR, \fB\-\-information\fR
 print information about our current connections (once)
-.TP
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
 Change the loglevel.  Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG.
-.TP
+.It Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOGFILE
-\fB\-l \fILOGFILE\fR, \fB\-\-logfile=LOGFILE\fR
 configure logging to write logs to LOGFILE
-.TP
+.It Fl m | \-monitor
-\fB\-m\fR, \fB\-\-monitor\fR
 print information about our current connections (continuously)
-.TP
+.It Fl p Ar PEER | Fl \-peer= Ns Ar PEER
-\fB\-p \fIPEER\fR, \fB\-\-peer=PEER\fR
 the peer identity to connect to or monitor
-.TP
+.It Fl P | \-plugins
-\fB\-P, \fB\-\-plugins\fR
 monitor session state of transport plugins
-.TP
+.It Fl s | \-send
-\fB\-s\fR, \fB\-\-send\fR
 transmit (dummy) traffic as quickly as possible to the peer specified
 with the \-p option.  The rate will still be limited by the quota(s)
 determined by the peers (ATS subsystem).  Will run until CTRL\-C is
 pressed or until the connection to the other peer is disrupted.
-.TP
+.It Fl v | \-version
-\fB\-v\fR, \fB\-\-version\fR
 print the version number
-.TP
+.It Fl V | \-verbose
-\fB\-V\fR, \fB\-\-verbose\fR
 be verbose
-.SH "REPORTING BUGS"
+.El
-Report bugs by using mantis <https://bugs.gnunet.org/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+.Sh SEE ALSO
-.SH "SEE ALSO"
+.Xr gnunet-arm 1 ,
-\fBgnunet\-arm\fP(1), \fBgnunet\-ats\fP(1)
+.Xr gnunet-ats 1
-The full documentation for
+.sp
-.B gnunet
+The full documentation for gnunet is maintained as a Texinfo manual.
-is maintained as a Texinfo manual.  If the
+If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-unindex.1 b/doc/man/gnunet-unindex.1
index 6aee4f62e..e953ce23a 100644
--- a/doc/man/gnunet-unindex.1
+++ b/doc/man/gnunet-unindex.1
@@ -1,58 +1,67 @@
-.TH GNUNET-UNINDEX "1" "September 6, 2009" "GNUnet"
+.Dd September 6, 2009
-.SH NAME
+.Dt GNUNET-UNINDEX 1
-gnunet\-unindex \- a command line interface for deleting indexed files from GNUnet
+.Sh NAME
-.SH SYNOPSIS
+.Nm gnunet-unindex
-.B gnunet\-unindex
+.Nd
-[\fIOPTIONS\fR] FILENAME
+a command line interface for deleting indexed files from GNUnet
-.SH DESCRIPTION
+.Sh SYNOPSIS
-.PP
+.Nm
-gnunet\-unindex is used for deleting indexed files from GNUnet.
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.TP
+.Op Fl h | \-help
-\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-use config file (defaults: ~/.config/gnunet.conf)
+.Op Fl v | \-version
-.TP
+.Op Fl V | \-verbose
-\fB\-h\fR, \fB\-\-help\fR
+FILENAME
+.Sh DESCRIPTION
+.Nm
+is used for deleting indexed files from GNUnet.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+Use config file FILENAME as config (default: ~/.config/gnunet.conf).
+.It Fl h | \-help
 print help page
-.TP
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
+Change the loglevel.
-Change the loglevel.  Possible values for LOGLEVEL are NOTHING,
+Possible values for LOGLEVEL are NOTHING, ERROR, WARNING, INFO and DEBUG.
-ERROR, WARNING, INFO and DEBUG.
+.It Fl v | \-version
-.TP
-\fB\-v\fR, \fB\-\-version\fR
 print the version number
-.TP
+.It Fl V | \-verbose
-\fB\-V\fR, \fB\-\-verbose\fR
 be verbose
-.SH NOTES
+.El
-You can only unindex files that you indexed and that you still have
+.Sh NOTES
-available locally in full.  You should use gnunet\-unindex on files
+You can only unindex files that you indexed and that you still have available locally in full.
-that you indexed (not inserted) and that you are going to delete or
+You should use gnunet-unindex on files that you indexed (not inserted) and that you are going to delete or move locally.
-move locally.
+.Sh FILES
-.TP
-.SH FILES
 .TP
 ~/.config/gnunet.conf
 GNUnet configuration file
-.SH "REPORTING BUGS"
+.Sh SEE ALSO
-Report bugs to <https://bugs.gnunet.org/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+.Xr gnunet-fs-gtk 1 ,
-.SH "SEE ALSO"
+.Xr gnunet-publish 1 ,
-\fBgnunet\-fs\-gtk\fP(1), \fBgnunet\-publish\fP(1), \fBgnunet\-search\fP(1), \fBgnunet\-download\fP(1), \fBgnunet.conf\fP(5)
+.Xr gnunet-search 1 ,
-The full documentation for
+.Xr gnunet-download 1 ,
-.B gnunet
+.Xr gnunet.conf 5
-is maintained as a Texinfo manual.  If the
+.sp
-.B info
+The full documentation for gnunet is maintained as a Texinfo manual.
-and
+If the
-.B gnunet
+.Xr info 1
-programs are properly installed at your site, the command
+and gnunet programs are properly installed at your site, the command
-.IP
+.Pp
-.B info gnunet
+.Dl info gnunet
-.PP
+.Pp
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-uri.1 b/doc/man/gnunet-uri.1
index 2fe1a05d2..bb525ef7f 100644
--- a/doc/man/gnunet-uri.1
+++ b/doc/man/gnunet-uri.1
@@ -1,49 +1,54 @@
-.TH GNUNET-URI 1 "June 26, 2012" "GNUnet"
+.Dd June 26, 2012
-.SH NAME
+.Dt GNUNET-URI 1
-gnunet\-uri \- invoke default handler for GNUnet URIs
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-uri
+.Nm gnunet-uri
-.RI URI
+.Nd
-.SH DESCRIPTION
+invoke default handler for GNUnet URIs
-\fBgnunet\-uri\fP can be used to invoke the correct tool to handle a
+.Sh SYNOPSIS
-GNUnet URI.  GNUnet URIs have the format "gnunet://SUBSYSTEM/DETAILS"
+.Nm
-and thus the specific tool to handle the URI depends on the subsystem.
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-gnunet\-uri will determine the correct tool (by looking for SUBSYSTEM
+.Op Fl h | \-help
-in the configuration section "uri") and invoke it.
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.SH OPTIONS
+.Op Fl v | \-version
-.B
+URI
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Sh DESCRIPTION
+.Nm
+can be used to invoke the correct tool to handle a GNUnet URI.
+GNUnet URIs have the format "gnunet://SUBSYSTEM/DETAILS" and thus the specific tool to handle the URI depends on the subsystem.
+gnunet-uri will determine the correct tool (by looking for SUBSYSTEM in the configuration section "uri") and invoke it.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
+Use LOGLEVEL for logging.
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
+Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
+.It Fl v | \-version
-.IP "\-v, \-\-version"
 Print GNUnet version number.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh SEE ALSO
-electronic mail to <gnunet\-developers@gnu.org>
+The full documentation for gnunet is maintained as a Texinfo manual.
-.SH SEE ALSO
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-vpn.1 b/doc/man/gnunet-vpn.1
index ddb53a7bd..e0fd2b78c 100644
--- a/doc/man/gnunet-vpn.1
+++ b/doc/man/gnunet-vpn.1
@@ -1,101 +1,98 @@
-.TH GNUNET\-VPN 1 "February 25, 2012" "GNUnet"
+.Dd February 25, 2012
-.SH NAME
+.Dt GNUNET-VPN 1
-gnunet\-vpn \- manually setup a GNUnet VPN tunnel
+.Sh NAME
-.SH SYNOPSIS
+.Nm gnunet-vpn
-.B gnunet\-vpn
+.Nd
-.RI [ options ]
+manually setup a GNUnet VPN tunnel
-.br
+.Sh SYNOPSIS
-.SH DESCRIPTION
+.Nm
-\fBgnunet\-vpn\fP can be used to manually setup a VPN tunnel via the
+.Op Fl 4 | \-ipv4
-GNUnet network.
+.Op Fl 6 | \-ipv6
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl d Ar TIME | Fl \-duration Ar TIME
+.Op Fl h | \-help
+.Op Fl i Ar IP | Fl \-ip Ar IP
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl p Ar PEERID | Fl \-peer= Ns Ar PEERID
+.Op Fl s Ar NAME | Fl \-service= Ns Ar NAME
+.Op Fl t | \-tcp
+.Op Fl u | \-udp
+.Op Fl V | \-verbose
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+can be used to manually setup a VPN tunnel via the GNUnet network.
 There are two main types of tunnels.
-Tunnels to an exit node which routes the traffic to the global
+Tunnels to an exit node which routes the traffic to the global Internet, and tunnels to a node that runs a service only within GNUnet.
-Internet, and tunnels to a node that runs a service only within
-GNUnet.
 Depending on the type of tunnel, gnunet\-vpn takes different options.
-The "\-i" option is required for tunnels to an exit node, whereas the
+The "\-i" option is required for tunnels to an exit node, whereas the "\-p" and "\-s" options in conjunction with either "\-u" or "\-t" are required for tunnels to services.
-"\-p" and "\-s" options in conjunction with either "\-u" or "\-t" are
-required for tunnels to services.
 For exit tunnels, both UDP and TCP traffic will be redirected.
-For service tunnels, either UDP ("\-u") or TCP ("\-t") traffic will
+For service tunnels, either UDP ("\-u") or TCP ("\-t") traffic will be redirected.
-be redirected.
 The tool will display the IP address for this end of the tunnel.
-The address can be displayed as soon as it has been allocated, or only
+The address can be displayed as soon as it has been allocated, or only after ("\-a") the tunnel has been created.
-after ("\-a") the tunnel has been created.
+.Bl -tag -width Ds
-.SH OPTIONS
+.It Fl 4 | \-ipv4
-.B
-.IP "\-4, \-\-ipv4"
 Desired IP address on this end of the tunnel should be an IPv4 address.
-.B
+.It Fl 6 | \-ipv6
-.IP "\-6, \-\-ipv6"
 Desired IP address on this end of the tunnel should be an IPv6 address.
-.B
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
+.It Fl d Ar TIME | Fl \-duration Ar TIME
-.IP "\-d TIME, \-\-duration TIME"
 The mapping should be established for TIME.
-The value given must be a number followed by a space and a time unit,
+The value given must be a number followed by a space and a time unit, for example "500 ms".
-for example "500 ms".
 Note that the quotes are required on the shell.
 Default is 5 minutes.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl i Ar IP | Fl \-ip Ar IP
-.IP "\-i IP, \-\-ip IP"
 Tunnel should be to an exit node and connect to the given IPv4 or IPv6
 IP address.
 Note that you can specify an IPv6 address as the target here, even in
 combination with "\-4" (4to6) and similarly you can specify an IPv4
 address in combination with "\-6" (6to4).
-.B
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
+.It Fl p Ar PEERID | Fl \-peer= Ns Ar PEERID
-.IP "\-p PEERID,  \-\-peer=PEERID"
 Name of the peer offering the service to connect to.
 Cannot be used in conjunction with "\-i", requires "\-s".
-.B
+.It Fl s Ar NAME | Fl \-service= Ns Ar NAME
-.IP "\-s NAME,  \-\-service=NAME"
 Name of the service running on the target peer.
 Cannot be used in conjunction with "\-i", requires "\-p".
-.B
+.It Fl t | \-tcp
-.IP "\-t, \-\-tcp"
 Service runs TCP.
 Either "\-t" or "\-u" must be specified when using "\-s".
-.B
+.It Fl u | \-udp
-.IP "\-u, \-\-udp"
 Service runs UDP.
 Either "\-t" or "\-u" must be specified when using "\-s".
-.B
+.It Fl V | \-verbose
-.IP "\-V, \-\-verbose"
 Be verbose.
-.B
+.It Fl v | \-version
-.IP "\-v, \-\-version"
 Print GNUnet version number.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh SEE ALSO
-electronic mail to <gnunet\-developers@gnu.org>
+.Xr gnunet-setup 1
-.SH SEE ALSO
+.sp
-gnunet\-setup(1)
+The full documentation for gnunet is maintained as a Texinfo manual.
-The full documentation for
+If the
-.B gnunet
+.Xr info 1
-is maintained as a Texinfo manual.  If the
+and gnunet programs are properly installed at your site, the command
-.B info
+.Pp
-and
+.Dl info gnunet
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-zoneimport.1 b/doc/man/gnunet-zoneimport.1
index 2a67718f9..e99b235b8 100644
--- a/doc/man/gnunet-zoneimport.1
+++ b/doc/man/gnunet-zoneimport.1
@@ -1,90 +1,106 @@
-.TH GNUNET-ZONEIMPORT 1 "April 23, 2018" "GNUnet"
+.\" This file is part of GNUnet.
-.SH NAME
+.\" Copyright (C) 2018, 2019 GNUnet e.V.
-gnunet\-zoneimport \- import DNS zone into GNS zone
+.\"
-.SH SYNOPSIS
+.\" Permission is granted to copy, distribute and/or modify this document
-.B gnunet\-zoneimport [IP]+
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
-.SH DESCRIPTION
+.\" any later version published by the Free Software Foundation; with no
-\fBgnunet\-zoneimport\fP reads a list of domain names (FQDN) from
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
-stdin and issues DNS queries for each of the domain names given.  It
+.\" copy of the license is included in the file
-then checks if a local ego with a name matching the domain
+.\" ``FDL-1.3''.
-exists. Specifically, if the domain name is "example.fr", it will
+.\"
-check if an ego "fr" exists, while for a domain "example.com.fr" it
+.\" A copy of the license is also available from the Free Software
-will look for an ego called "com.fr"). If so, it will convert the DNS
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/fdl.html}.
-records into GNS records (in particular converting NS records and glue
+.\"
-records to GNS2DNS records) and add them to the namestore under the
+.\" Alternately, this document is also available under the General
-label ("example" in the examples above).
+.\" Public License, version 3 or later, as published by the Free Software
-.PP
+.\" Foundation.  A copy of the license is included in the file
-The arguments given to gnunet\-zoneimport is a list of IP addresses of
+.\" ``GPL3''.
-DNS servers to query.
+.\"
-.PP
+.\" A copy of the license is also available from the Free Software
-gnunet\-zoneimport will usually never terminate: it will check when
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/gpl.html}.
-DNS records expire, and re-issue requests when the old DNS records
+.\"
-have expired so that GNS always has the latest data.
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
-.PP
+.\"
-gnunet\-zoneimport will issue many DNS queries in parallel, but is
+.Dd April 23, 2018
-rate-limited in various ways, so most DNS servers should easily handle
+.Dt GNUNET-ZONEIMPORT 1
-the load.  gnunet\-zoneimport will perform a limited number of retries
+.Os
-if queries fail.
+.Sh NAME
-.PP
+.Nm gnunet-zoneimport
-gnunet\-zoneimport operates incrementally. It will check if the
+.Nd
-namestore already has (non-expired) records stored for a given name in
+import DNS zone into GNS zone
-the respective zone and not issue those requests again.  Thus, it is
+.Sh SYNOPSIS
-fine to restart gnunet\-zoneimport whenever the list of domain names
+.Nm
-changes.
+.Op Fl c Ar FILENAME | \-config= Ns Ar FILENAME
-.PP
+.Op Fl h | \-help
-Finally, gnunet\-zoneimport keeps information for each domain name in
+.Op Fl m Ar RELATIVETIME | Fl \-minimum-expiration= Ns Ar RELATIVETIME
-memory.  This consumes about 200 bytes per domain name, or 1 GB for 5
+.Op Fl s Ar MAPSIZE | Fl \-size= Ns Ar MAPSIZE
-million labels.
+.Op Ar \IP
-.SH OPTIONS
+.Sh DESCRIPTION
-.B
+.Nm
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+reads a list of domain names (FQDN) from stdin and issues DNS queries for each of the domain names given.
+It then checks if a local ego with a name matching the domain exists.
+Specifically, if the domain name is "example.fr", it will check if an ego "fr" exists, while for a domain "example.com.fr" it will look for an ego called "com.fr").
+If so, it will convert the DNS records into GNS records (in particular converting NS records and glue records to GNS2DNS records) and add them to the namestore under the label ("example" in the examples above).
+.Pp
+The arguments given to gnunet-zoneimport is a list of IP addresses of DNS servers to query.
+.Pp
+gnunet-zoneimport will usually never terminate: it will check when DNS records expire, and re-issue requests when the old DNS records have expired so that GNS always has the latest data.
+.Pp
+gnunet-zoneimport will issue many DNS queries in parallel, but is rate-limited in various ways, so most DNS servers should easily handle the load.
+gnunet-zoneimport will perform a limited number of retries if queries fail.
+.Pp
+gnunet-zoneimport operates incrementally.
+It will check if the namestore already has (non-expired) records stored for a given name in the respective zone and not issue those requests again.
+Thus, it is fine to restart gnunet-zoneimport whenever the list of domain names changes.
+.Pp
+Finally, gnunet-zoneimport keeps information for each domain name in memory.
+This consumes about 200 bytes per domain name, or 1 GB for 5 million labels.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl m Ar RELATIVETIME | Fl \-minimum-expiration= Ns Ar RELATIVETIME
-.IP "\-m RELATIVETIME, \-\-minimum-expiration=RELATIVETIME"
+Ensure that imported DNS records never have an expiration time that is less than RELATIVETIME into the future.
-.B
+RELATIVETIME is a time given like "1 week" or "1 h".
-Ensure that imported DNS records never have an expiration time that
+If DNS returns records with a shorter lifetime, gnunet\-zoneimport will simply bump the lifetime to the specified value (relative to the time of the import).
-is less than RELATIVETIME into the future.  RELATIVETIME is a time
+Default is zero.
-given like "1 week" or "1 h".   If DNS returns records with a shorter
+.It Fl s Ar MAPSIZE | Fl \-size= Ns Ar MAPSIZE
-lifetime, gnunet\-zoneimport will simply bump the lifetime to the
+Specifies the size (in number of entries) to use for the main hash map.
-specified value (relative to the time of the import). Default is zero.
+The value provided should be at least twice the number of domain names that will be given to the tool.
-.IP "\-s MAPSIZE, \-\-size=MAPSIZE"
+This option is required for very large zones where the number of records encountered is too large for the automatic growth mechanism to work (that one is limited to at most 16 MB allocations for security reasons).
-Specifies the size (in number of entries) to use for the main hash
+Do not worry about this unless you are importing millions of domain names from a zone.
-map.  The value provided should be at least twice the number of domain
+.It Ar \IP
-names that will be given to the tool. This option is required for very
+IP Is the list of IPs given.
-large zones where the number of records encountered is too large for
+.El
-the automatic growth mechanism to work (that one is limited to at most
+.Sh EXAMPLES
-16 MB allocations for security reasons).  Do not worry about this
-unless you are importing millions of domain names from a zone.
-.SH NOTES
-.TP
 Typical invocaton would be:
-$ gnunet\-zoneimport 1.2.3.4 < names.txt
+.Pp
-.SH BUGS
+.Dl $ gnunet\-zoneimport 1.2.3.4 < names.txt
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh SEE ALSO
-electronic mail to <gnunet\-developers@gnu.org>
+.Xr gnunet-gns 1 ,
-.SH SEE ALSO
+.Xr gnunet-namestore 1
-gnunet\-gns(1), gnunet\-namestore(1)
+.sp
-.PP
+The full documentation for gnunet is maintained as a Texinfo manual.
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet.conf.5.in b/doc/man/gnunet.conf.5.in
index 560704784..82340996a 100644
--- a/doc/man/gnunet.conf.5.in
+++ b/doc/man/gnunet.conf.5.in
@@ -1,4 +1,27 @@
 .\" -*- mode: nroff -*-
+.\" This file is part of Ascension.
+.\" Copyright (C) 2012-2015,2018,2019 GNUnet e.V.
+.\"
+.\" Permission is granted to copy, distribute and/or modify this document
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
+.\" any later version published by the Free Software Foundation; with no
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+.\" copy of the license is included in the file
+.\" ``FDL-1.3''.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/fdl.html}.
+.\"
+.\" Alternately, this document is also available under the General
+.\" Public License, version 3 or later, as published by the Free Software
+.\" Foundation.  A copy of the license is included in the file
+.\" ``GPL3''.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/gpl.html}.
+.\"
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
+.\"
 .TH GNUNET.CONF "5" "October 26, 2018" "GNUnet"
 .SH NAME
 gnunet.conf \- GNUnet configuration file
@@ -27,7 +50,7 @@ Default values for all of the options can be found in the files in the
 "$GNUNET_PREFIX/share/gnunet/config.d/" directory. A typical setup will
 work out of the box with those. See the examples section below for
 some common setups on top of that.
-.SH General OPTIONS
+.SS GENERAL OPTIONS
 Many options will be common between sections. They can be repeated under
 each section with different values.  The "[PATHS]" section is special.
 Here, it is possible to specify values for variables like "GNUNET_HOME".
@@ -85,7 +108,7 @@ The following options are generic and shared by all services:
    Set to YES if this service should be run per-user, NO if this is a system
    service.  End-users should never have to change the defaults GNUnet provides
    for this option.
-.SH ATS Options
+.SS ATS OPTIONS
 .IP UNSPECIFIED_QUOTA_IN
    quotes in KiB or MiB per seconds.  Or use the word "unlimited"
 .IP UNSPECIFIED_QUOTA_OUT
@@ -109,12 +132,11 @@ The following options are generic and shared by all services:
 .SH EXAMPLES
 This example is a simple way to get started, using a server that has a known
 list of peers to get you started. Most users will be behind a firewall on
-IPv4, as such NAT is enabled.  Please rememeber to change your IP address
+IPv4, as such NAT is enabled.  Please remember to change your IP address
 to the actual external address for your usage.
 .PP
    [hostlist]
-    OPTIONS = \-b
+    OPTIONS = \-b \-e
-    SERVERS = http://v9.gnunet.org:58080/
    [nat]
    BEHIND_NAT = YES
@@ -129,9 +151,6 @@ to the actual external address for your usage.
 .TP
 ~/.config/gnunet.conf
 GNUnet configuration file
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <bug-gnunet@gnu.org>
 .SH SEE ALSO
 \fBgnunet\-setup\fP(1), \fBgnunet\-arm\fP(1)
 .PP
@@ -155,3 +174,9 @@ will give you access to a tutorial for developers.
 Depending on your installation, this information is also
 available in
 \fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.SH HISTORY
+.PP
+This man page first appeared in October 2012 in GNUnet.
+.SH BUGS
+Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+electronic mail to <bug-gnunet@gnu.org>
diff --git a/doc/man/produce_html.sh b/doc/man/produce_html.sh
new file mode 100755
index 000000000..ce6dea304
--- /dev/null
+++ b/doc/man/produce_html.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+existence()
+{
+    command -v "$1" >/dev/null 2>&1
+}
+if existence mandoc;
+then
+    for f in `find . -name \*\.[1-9]`;
+    do
+        mandoc -T html $f > $f.html;
+    done
+fi
diff --git a/doc/man/texi2mdoc-generation.sh b/doc/man/texi2mdoc-generation.sh
new file mode 100755
index 000000000..b88987cda
--- /dev/null
+++ b/doc/man/texi2mdoc-generation.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+# This script is in the public-domain.
+# GNUnet e.V. 2019
+#
+# Commentary: generate texi2mdoc output. This would be easier with
+# bmake / BSDmake, oh well.
+#
+# Excercise for future readers: don't fix this.
+# echo $(pwd)
+cd ../tutorial
+texi2mdoc -I$(pwd):$(pwd)/chapters gnunet-tutorial.texi > ../man/gnunet-c-tutorial.7
+# echo $(pwd)
+cd ../handbook
+texi2mdoc -I$(pwd):$(pwd)/chapters gnunet.texi > ../man/gnunet-documentation.7
diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index d0fd14a4a..f3908aa99 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -8,7 +8,7 @@ docdir = $(datadir)/doc/gnunet/
 #       $(DOT_FILES:%.dot=%.pdf)
 # See ../handbook/Makefile.am comment!
-AM_MAKEINFOHTMLFLAGS = --no-split --css-include=docstyle.css
+AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css
 #DOT_OPTIONS =                                                  \
 #       -Gratio=.9 -Gnodesep=.005 -Granksep=.00005              \
@@ -93,12 +93,7 @@ version.texi/replacement/revert:
        @echo "@set VERSION GPACKAGE_VERSION" > gversion.texi
        @echo "@set EDITION GPACKAGE_VERSION" >> gversion.texi
-if TEXI2MDOC_GENERATION
-gnunet-tutorial.7: version.texi/replacement
-        @echo Attempting to output an mdoc formatted section 7 document
-        @texi2mdoc -I$(pwd):$(pwd)/chapters gnunet-c-tutorial.texi > ../man/gnunet-c-tutorial.7
-# TODO: (Maybe) other outputs resulting from this.
-endif
 # FIXME: rm *.html and *.pdf
 #doc-clean:
diff --git a/doc/tutorial/gnunet-tutorial.texi b/doc/tutorial/gnunet-tutorial.texi
index ef3318cad..df75fb995 100644
--- a/doc/tutorial/gnunet-tutorial.texi
+++ b/doc/tutorial/gnunet-tutorial.texi
@@ -1,10 +1,10 @@
 \input texinfo
-@c %**start of header
 @setfilename gnunet-tutorial.info
 @documentencoding UTF-8
 @settitle GNUnet Tutorial
 @c @exampleindent 2
-@c %**end of header
 @include version.texi
diff --git a/doc/tutorial/manual.css b/doc/tutorial/manual.css
index 404525dc2..0fe08b83c 100644
--- a/doc/tutorial/manual.css
+++ b/doc/tutorial/manual.css
@@ -1,6 +1,6 @@
 /* Style-sheet to use for manuals (copied from Emacs) */
-@import url('/style.css');
+@import url('style.css');
 /* makeinfo 6.5 converts @quotation to <blockquote>.  Highlight them.  */
 blockquote {
diff --git a/doc/tutorial/run-gendocs.sh b/doc/tutorial/run-gendocs.sh
index 5e60a2d0f..b4899722c 100755
--- a/doc/tutorial/run-gendocs.sh
+++ b/doc/tutorial/run-gendocs.sh
@@ -7,7 +7,7 @@ make version.texi/replacement
 #mkdir gnunet-c-tutorial
 #mv * gnunet-c-tutorial/
 #cd ..
-./gendocs.sh --email gnunet-developers@gnu.org gnunet "GNUnet Reference Manual" -o "manual/gnunet"
+#./gendocs.sh --email gnunet-developers@gnu.org gnunet "GNUnet Reference Manual" -o "manual/gnunet"
 #cd manual
 #mkdir handbook
 #mkdir ../tmp-gnunet
diff --git a/doc/tutorial/style.css b/doc/tutorial/style.css
index 0c4525437..e5271197b 100644
--- a/doc/tutorial/style.css
+++ b/doc/tutorial/style.css
@@ -1,6 +1,6 @@
 /* This stylesheet is used by manuals and a few older resources. */
-@import url('/reset.css');
+@import url('reset.css');
 /***  PAGE LAYOUT  ***/
diff --git a/lint/.gitignore b/lint/.gitignore
new file mode 100644
index 000000000..6dd860453
--- /dev/null
+++ b/lint/.gitignore
@@ -0,0 +1 @@
+checkbashisms.pl
+\ No newline at end of file
diff --git a/lint/Makefile.am b/lint/Makefile.am
new file mode 100644
index 000000000..0de8da54a
--- /dev/null
+++ b/lint/Makefile.am
@@ -0,0 +1,59 @@
+all: check-linters
+do_subst = $(SED) -e 's,[@]PERL[@],$(PERL),g'
+SUFFIXES = pl.in .pl
+checkbashisms.pl: checkbashisms.pl.in Makefile
+        $(do_subst) < $(srcdir)/checkbashisms.pl.in > checkbashisms.pl
+        chmod +x checkbashisms.pl
+CLEANFILES=     \
+                checkbashisms.pl
+noinst_SCRIPTS =                \
+                $(CLEANFILES)
+# Check for bashisms in shell scripts
+# Very verbose, need to exclude more files.
+check-bashism:
+        printf "Run checkbashism on all .sh files.\n"
+        printf "Currently this expects checkbashism.pl at a fixed location."
+        find '..' -type f ! -path '*/.*' ! -path '*/_*' -name '*.sh' -print0 | xargs -0 $(srcdir)/checkbashisms.pl -f 2>&1 | tee $(srcdir)/bashism.log || true
+check-python:
+        printf "Running flake8 and 2to3 if detected.\n"
+        $(top_srcdir)/contrib/scripts/lint-python.sh || true
+check-man:
+        printf "Running lint-man.sh in doc/man.\n"
+        @cd $(top_srcdir)/doc/man ; ../../contrib/scripts/lint-man.sh || true
+# exception to add: ignore license files.
+# exception to add: uref's can go above 79 chars.
+check-texinfo:
+        printf "Running basic texinfo linters\n"
+        printf "...lines containing tabstops?\n" 2>&1 | tee $(top_srcdir)/doc/handbook/texinfo_handbook.log || true
+        printf "...lines containing tabstops?\n" 2>&1 | tee $(top_srcdir)/doc/tutorial/texinfo_tutorial.log || true
+        @cd $(top_srcdir)/doc/handbook ; find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 awk '/\t/ {print FILENAME":"NR":"$$0}' > $(srcdir)/texinfo_handbook.log || true
+        @cd $(top_srcdir)/doc/tutorial ; find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 awk '/\t/ {print FILENAME":"NR":"$$0}' > $(srcdir)/texinfo_tutorial.log || true
+        printf "...line length over 79 chars?\n" 2>&1 | tee $(top_srcdir)/doc/handbook/texinfo_handbook.log || true
+        @cd $(top_srcdir)/doc/handbook ; find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 awk 'length>79 {print FILENAME":"NR":"$$0}' > $(srcdir)/texinfo_handbook.log || true
+        printf "...line length over 79 chars?\n" 2>&1 | tee $(top_srcdir)/doc/tutorial/texinfo_tutorial.log || true
+        @cd $(top_srcdir)/doc/tutorial ; find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 awk 'length>79 {print FILENAME":"NR":"$$0}' > $(srcdir)/texinfo_tutorial.log || true
+        printf "...lines containing macros incompatible with old makeinfo?\n" 2>&1 | tee -a $(top_srcdir)/doc/handbook/texinfo_handbook.log || true
+        @cd $(top_srcdir)/doc/handbook ; find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 awk '/@geq\{\}/ {print FILENAME":"NR":"$$0}' >> $(srcdir)/texinfo_handbook.log || true
+        printf "...lines containing macros incompatible with old makeinfo?\n" 2>&1 | tee -a $(top_srcdir)/doc/tutorial/texinfo_tutorial.log || true
+        @cd $(top_srcdir)/doc/tutorial ; find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 awk '/@geq\{\}/ {print FILENAME":"NR":"$$0}' >> $(srcdir)/texinfo_tutorial.log || true
+        printf "...lines containing macros incompatible with texi2mdoc?\n" 2>&1 | tee -a $(top_srcdir)/doc/handbook/texinfo_handbook.log || true
+        @cd $(top_srcdir)/doc/handbook ; find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 awk '/@footnote\{/ {print FILENAME":"NR":"$$0}' >> $(srcdir)/texinfo_handbook.log || true
+        printf "...lines containing macros incompatible with texi2mdoc?\n" 2>&1 | tee -a $(top_srcdir)/doc/tutorial/texinfo_tutorial.log || true
+        @cd $(top_srcdir)/doc/tutorial ; find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 awk '/@footnote\{/ {print FILENAME":"NR":"$$0}' >> $(srcdir)/texinfo_tutorial.log || true
+        printf "...lines telling us what is left TODO or to fix?\n" 2>&1 | tee -a $(top_srcdir)/doc/handbook/texinfo_handbook.log || true
+        @cd $(top_srcdir)/doc/handbook ; find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 awk '/TODO/ {print FILENAME":"NR":"$$0}' >> $(srcdir)/texinfo_handbook.log || true
+        @cd $(top_srcdir)/doc/handbook ; find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 awk '/XXX/ {print FILENAME":"NR":"$$0}' >> $(srcdir)/texinfo_handbook.log || true
+        printf "...lines telling us what is left TODO or to fix?\n" 2>&1 | tee -a $(top_srcdir)/doc/tutorial/texinfo_tutorial.log || true
+        @cd $(top_srcdir)/doc/tutorial ; find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 awk '/TODO/ {print FILENAME":"NR":"$$0}' >> $(srcdir)/texinfo_tutorial.log || true
+        @cd $(top_srcdir)/doc/tutorial ; find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 awk '/XXX/ {print FILENAME":"NR":"$$0}' >> $(srcdir)/texinfo_tutorial.log || true
+check-linters: check-bashism check-python check-man check-texinfo
diff --git a/lint/checkbashisms.1 b/lint/checkbashisms.1
new file mode 100644
index 000000000..6df5f3c78
--- /dev/null
+++ b/lint/checkbashisms.1
@@ -0,0 +1,68 @@
+.TH CHECKBASHISMS 1 "Debian Utilities" "DEBIAN" \" -*- nroff -*-
+.SH NAME
+checkbashisms \- check for bashisms in /bin/sh scripts
+.SH SYNOPSIS
+\fBcheckbashisms\fR \fIscript\fR ...
+.br
+\fBcheckbashisms \-\-help\fR|\fB\-\-version\fR
+.SH DESCRIPTION
+\fBcheckbashisms\fR, based on one of the checks from the \fBlintian\fR
+system, performs basic checks on \fI/bin/sh\fR shell scripts for the
+possible presence of bashisms.  It takes the names of the shell
+scripts on the command line, and outputs warnings if possible bashisms
+are detected.
+.PP
+Note that the definition of a bashism in this context roughly equates
+to "a shell feature that is not required to be supported by POSIX"; this
+means that some issues flagged may be permitted under optional sections
+of POSIX, such as XSI or User Portability.
+.PP
+In cases where POSIX and Debian Policy disagree, \fBcheckbashisms\fR by
+default allows extensions permitted by Policy but may also provide
+options for stricter checking.
+.SH OPTIONS
+.TP
+.BR \-\-help ", " \-h
+Show a summary of options.
+.TP
+.BR \-\-newline ", " \-n
+Check for "\fBecho \-n\fR" usage (non POSIX but required by Debian Policy 10.4.)
+.TP
+.BR \-\-posix ", " \-p
+Check for issues which are non POSIX but required to be supported by Debian
+Policy 10.4 (implies \fB\-n\fR).
+.TP
+.BR \-\-force ", " \-f
+Force each script to be checked, even if it would normally not be (for
+instance, it has a bash or non POSIX shell shebang or appears to be a
+shell wrapper).
+.TP
+.BR \-\-extra ", " \-x
+Highlight lines which, whilst they do not contain bashisms, may be
+useful in determining whether a particular issue is a false positive
+which may be ignored.
+For example, the use of "\fB$BASH_ENV\fR" may be preceded by checking
+whether "\fB$BASH\fR" is set.
+.TP
+.BR \-\-version ", " \-v
+Show version and copyright information.
+.SH "EXIT VALUES"
+The exit value will be 0 if no possible bashisms or other problems
+were detected.  Otherwise it will be the sum of the following error
+values:
+.TP
+1
+A possible bashism was detected.
+.TP
+2
+A file was skipped for some reason, for example, because it was
+unreadable or not found.  The warning message will give details.
+.TP
+4
+No bashisms were detected in a bash script.
+.SH "SEE ALSO"
+.BR lintian (1)
+.SH AUTHOR
+\fBcheckbashisms\fR was originally written as a shell script by Yann Dirson
+<\fIdirson@debian.org\fR> and rewritten in Perl with many more features by
+Julian Gilbey <\fIjdg@debian.org\fR>.
diff --git a/lint/checkbashisms.pl.in b/lint/checkbashisms.pl.in
new file mode 100755
index 000000000..0b8b06f86
--- /dev/null
+++ b/lint/checkbashisms.pl.in
@@ -0,0 +1,814 @@
+#!@PERL@
+# This script is essentially copied from /usr/share/lintian/checks/scripts,
+# which is:
+#   Copyright (C) 1998 Richard Braakman
+#   Copyright (C) 2002 Josip Rodin
+# This version is
+#   Copyright (C) 2003 Julian Gilbey
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+use strict;
+use warnings;
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
+use File::Temp qw/tempfile/;
+sub init_hashes;
+(my $progname = $0) =~ s|.*/||;
+my $usage = <<"EOF";
+Usage: $progname [-n] [-f] [-x] script ...
+   or: $progname --help
+   or: $progname --version
+This script performs basic checks for the presence of bashisms
+in /bin/sh scripts and the lack of bashisms in /bin/bash ones.
+EOF
+my $version = <<"EOF";
+This is $progname, from the Debian devscripts package, version ###VERSION###
+This code is copyright 2003 by Julian Gilbey <jdg\@debian.org>,
+based on original code which is copyright 1998 by Richard Braakman
+and copyright 2002 by Josip Rodin.
+This program comes with ABSOLUTELY NO WARRANTY.
+You are free to redistribute this code under the terms of the
+GNU General Public License, version 2, or (at your option) any later version.
+EOF
+my ($opt_echo, $opt_force, $opt_extra, $opt_posix);
+my ($opt_help, $opt_version);
+my @filenames;
+# Detect if STDIN is a pipe
+if (scalar(@ARGV) == 0 && (-p STDIN or -f STDIN)) {
+    push(@ARGV, '-');
+}
+##
+## handle command-line options
+##
+$opt_help = 1 if int(@ARGV) == 0;
+GetOptions(
+    "help|h"    => \$opt_help,
+    "version|v" => \$opt_version,
+    "newline|n" => \$opt_echo,
+    "force|f"   => \$opt_force,
+    "extra|x"   => \$opt_extra,
+    "posix|p"   => \$opt_posix,
+  )
+  or die
+"Usage: $progname [options] filelist\nRun $progname --help for more details\n";
+if ($opt_help)    { print $usage;   exit 0; }
+if ($opt_version) { print $version; exit 0; }
+$opt_echo = 1 if $opt_posix;
+my $mode     = 0;
+my $issues   = 0;
+my $status   = 0;
+my $makefile = 0;
+my (%bashisms, %string_bashisms, %singlequote_bashisms);
+my $LEADIN
+  = qr'(?:(?:^|[`&;(|{])\s*|(?:(?:if|elif|while)(?:\s+!)?|then|do|shell)\s+)';
+init_hashes;
+my @bashisms_keys             = sort keys %bashisms;
+my @string_bashisms_keys      = sort keys %string_bashisms;
+my @singlequote_bashisms_keys = sort keys %singlequote_bashisms;
+foreach my $filename (@ARGV) {
+    my $check_lines_count = -1;
+    my $display_filename = $filename;
+    if ($filename eq '-') {
+        my $tmp_fh;
+        ($tmp_fh, $filename)
+          = tempfile("chkbashisms_tmp.XXXX", TMPDIR => 1, UNLINK => 1);
+        while (my $line = <STDIN>) {
+            print $tmp_fh $line;
+        }
+        close($tmp_fh);
+        $display_filename = "(stdin)";
+    }
+    if (!$opt_force) {
+        $check_lines_count = script_is_evil_and_wrong($filename);
+    }
+    if ($check_lines_count == 0 or $check_lines_count == 1) {
+        warn
+"script $display_filename does not appear to be a /bin/sh script; skipping\n";
+        next;
+    }
+    if ($check_lines_count != -1) {
+        warn
+"script $display_filename appears to be a shell wrapper; only checking the first "
+          . "$check_lines_count lines\n";
+    }
+    unless (open C, '<', $filename) {
+        warn "cannot open script $display_filename for reading: $!\n";
+        $status |= 2;
+        next;
+    }
+    $issues = 0;
+    $mode   = 0;
+    my $cat_string         = "";
+    my $cat_indented       = 0;
+    my $quote_string       = "";
+    my $last_continued     = 0;
+    my $continued          = 0;
+    my $found_rules        = 0;
+    my $buffered_orig_line = "";
+    my $buffered_line      = "";
+    my %start_lines;
+    while (<C>) {
+        next unless ($check_lines_count == -1 or $. <= $check_lines_count);
+        if ($. == 1) {    # This should be an interpreter line
+            if (m,^\#!\s*(?:\S+/env\s+)?(\S+),) {
+                my $interpreter = $1;
+                if ($interpreter =~ m,(?:^|/)make$,) {
+                    init_hashes if !$makefile++;
+                    $makefile = 1;
+                } else {
+                    init_hashes if $makefile--;
+                    $makefile = 0;
+                }
+                next if $opt_force;
+                if ($interpreter =~ m,(?:^|/)bash$,) {
+                    $mode = 1;
+                } elsif ($interpreter !~ m,(?:^|/)(sh|dash|posh)$,) {
+### ksh/zsh?
+                    warn
+"script $display_filename does not appear to be a /bin/sh script; skipping\n";
+                    $status |= 2;
+                    last;
+                }
+            } else {
+                warn
+"script $display_filename does not appear to have a \#! interpreter line;\nyou may get strange results\n";
+            }
+        }
+        chomp;
+        my $orig_line = $_;
+        # We want to remove end-of-line comments, so need to skip
+        # comments that appear inside balanced pairs
+        # of single or double quotes
+        # Remove comments in the "quoted" part of a line that starts
+        # in a quoted block? The problem is that we have no idea
+        # whether the program interpreting the block treats the
+        # quote character as part of the comment or as a quote
+        # terminator. We err on the side of caution and assume it
+        # will be treated as part of the comment.
+        # s/^(?:.*?[^\\])?$quote_string(.*)$/$1/ if $quote_string ne "";
+        # skip comment lines
+        if (   m,^\s*\#,
+            && $quote_string eq ''
+            && $buffered_line eq ''
+            && $cat_string eq '') {
+            next;
+        }
+        # Remove quoted strings so we can more easily ignore comments
+        # inside them
+        s/(^|[^\\](?:\\\\)*)\'(?:\\.|[^\\\'])+\'/$1''/g;
+        s/(^|[^\\](?:\\\\)*)\"(?:\\.|[^\\\"])+\"/$1""/g;
+        # If inside a quoted string, remove everything before the quote
+        s/^.+?\'//
+          if ($quote_string eq "'");
+        s/^.+?[^\\]\"//
+          if ($quote_string eq '"');
+        # If the remaining string contains what looks like a comment,
+        # eat it. In either case, swap the unmodified script line
+        # back in for processing.
+        if (m/(?:^|[^[\\])[\s\&;\(\)](\#.*$)/) {
+            $_ = $orig_line;
+            s/\Q$1\E//;    # eat comments
+        } else {
+            $_ = $orig_line;
+        }
+        # Handle line continuation
+        if (!$makefile && $cat_string eq '' && m/\\$/) {
+            chop;
+            $buffered_line .= $_;
+            $buffered_orig_line .= $orig_line . "\n";
+            next;
+        }
+        if ($buffered_line ne '') {
+            $_                  = $buffered_line . $_;
+            $orig_line          = $buffered_orig_line . $orig_line;
+            $buffered_line      = '';
+            $buffered_orig_line = '';
+        }
+        if ($makefile) {
+            $last_continued = $continued;
+            if (/[^\\]\\$/) {
+                $continued = 1;
+            } else {
+                $continued = 0;
+            }
+            # Don't match lines that look like a rule if we're in a
+            # continuation line before the start of the rules
+            if (/^[\w%-]+:+\s.*?;?(.*)$/
+                and !($last_continued and !$found_rules)) {
+                $found_rules = 1;
+                $_ = $1 if $1;
+            }
+            last
+              if m%^\s*(override\s|export\s)?\s*SHELL\s*:?=\s*(/bin/)?bash\s*%;
+            # Remove "simple" target names
+            s/^[\w%.-]+(?:\s+[\w%.-]+)*::?//;
+            s/^\t//;
+            s/(?<!\$)\$\((\w+)\)/\${$1}/g;
+            s/(\$){2}/$1/g;
+            s/^[\s\t]*[@-]{1,2}//;
+        }
+        if (
+            $cat_string ne ""
+            && (m/^\Q$cat_string\E$/
+                || ($cat_indented && m/^\t*\Q$cat_string\E$/))
+        ) {
+            $cat_string = "";
+            next;
+        }
+        my $within_another_shell = 0;
+        if (m,(^|\s+)((/usr)?/bin/)?((b|d)?a|k|z|t?c)sh\s+-c\s*.+,) {
+            $within_another_shell = 1;
+        }
+        # if cat_string is set, we are in a HERE document and need not
+        # check for things
+        if ($cat_string eq "" and !$within_another_shell) {
+            my $found       = 0;
+            my $match       = '';
+            my $explanation = '';
+            my $line        = $_;
+            # Remove "" / '' as they clearly aren't quoted strings
+            # and not considering them makes the matching easier
+            $line =~ s/(^|[^\\])(\'\')+/$1/g;
+            $line =~ s/(^|[^\\])(\"\")+/$1/g;
+            if ($quote_string ne "") {
+                my $otherquote = ($quote_string eq "\"" ? "\'" : "\"");
+                # Inside a quoted block
+                if ($line =~ /(?:^|^.*?[^\\])$quote_string(.*)$/) {
+                    my $rest     = $1;
+                    my $templine = $line;
+                    # Remove quoted strings delimited with $otherquote
+                    $templine
+                      =~ s/(^|[^\\])$otherquote[^$quote_string]*?[^\\]$otherquote/$1/g;
+                    # Remove quotes that are themselves quoted
+                    # "a'b"
+                    $templine
+                      =~ s/(^|[^\\])$otherquote.*?$quote_string.*?[^\\]$otherquote/$1/g;
+                    # "\""
+                    $templine
+                      =~ s/(^|[^\\])$quote_string\\$quote_string$quote_string/$1/g;
+                    # After all that, were there still any quotes left?
+                    my $count = () = $templine =~ /(^|[^\\])$quote_string/g;
+                    next if $count == 0;
+                    $count = () = $rest =~ /(^|[^\\])$quote_string/g;
+                    if ($count % 2 == 0) {
+                        # Quoted block ends on this line
+                        # Ignore everything before the closing quote
+                        $line = $rest || '';
+                        $quote_string = "";
+                    } else {
+                        next;
+                    }
+                } else {
+                    # Still inside the quoted block, skip this line
+                    next;
+                }
+            }
+            # Check even if we removed the end of a quoted block
+            # in the previous check, as a single line can end one
+            # block and begin another
+            if ($quote_string eq "") {
+                # Possible start of a quoted block
+                for my $quote ("\"", "\'") {
+                    my $templine = $line;
+                    my $otherquote = ($quote eq "\"" ? "\'" : "\"");
+                    # Remove balanced quotes and their content
+                    while (1) {
+                        my ($length_single, $length_double) = (0, 0);
+                        # Determine which one would match first:
+                        if ($templine
+                            =~ m/(^.+?(?:^|[^\\\"](?:\\\\)*)\')[^\']*\'/) {
+                            $length_single = length($1);
+                        }
+                        if ($templine
+                            =~ m/(^.*?(?:^|[^\\\'](?:\\\\)*)\")(?:\\.|[^\\\"])+\"/
+                        ) {
+                            $length_double = length($1);
+                        }
+                        # Now simplify accordingly (shorter is preferred):
+                        if (
+                            $length_single != 0
+                            && (   $length_single < $length_double
+                                || $length_double == 0)
+                        ) {
+                            $templine =~ s/(^|[^\\\"](?:\\\\)*)\'[^\']*\'/$1/;
+                        } elsif ($length_double != 0) {
+                            $templine
+                              =~ s/(^|[^\\\'](?:\\\\)*)\"(?:\\.|[^\\\"])+\"/$1/;
+                        } else {
+                            last;
+                        }
+                    }
+                    # Don't flag quotes that are themselves quoted
+                    # "a'b"
+                    $templine =~ s/$otherquote.*?$quote.*?$otherquote//g;
+                    # "\""
+                    $templine =~ s/(^|[^\\])$quote\\$quote$quote/$1/g;
+                    # \' or \"
+                    $templine =~ s/\\[\'\"]//g;
+                    my $count = () = $templine =~ /(^|(?!\\))$quote/g;
+                    # If there's an odd number of non-escaped
+                    # quotes in the line it's almost certainly the
+                    # start of a quoted block.
+                    if ($count % 2 == 1) {
+                        $quote_string = $quote;
+                        $start_lines{'quote_string'} = $.;
+                        $line =~ s/^(.*)$quote.*$/$1/;
+                        last;
+                    }
+                }
+            }
+            # since this test is ugly, I have to do it by itself
+            # detect source (.) trying to pass args to the command it runs
+            # The first expression weeds out '. "foo bar"'
+            if (    not $found
+                and not
+m/$LEADIN\.\s+(\"[^\"]+\"|\'[^\']+\'|\$\([^)]+\)+(?:\/[^\s;]+)?)\s*(\&|\||\d?>|<|;|\Z)/o
+                and m/$LEADIN(\.\s+[^\s;\`:]+\s+([^\s;]+))/o) {
+                if ($2 =~ /^(\&|\||\d?>|<)/) {
+                    # everything is ok
+                    ;
+                } else {
+                    $found       = 1;
+                    $match       = $1;
+                    $explanation = "sourced script with arguments";
+                    output_explanation($display_filename, $orig_line,
+                        $explanation);
+                }
+            }
+            # Remove "quoted quotes". They're likely to be inside
+            # another pair of quotes; we're not interested in
+            # them for their own sake and removing them makes finding
+            # the limits of the outer pair far easier.
+            $line =~ s/(^|[^\\\'\"])\"\'\"/$1/g;
+            $line =~ s/(^|[^\\\'\"])\'\"\'/$1/g;
+            foreach my $re (@singlequote_bashisms_keys) {
+                my $expl = $singlequote_bashisms{$re};
+                if ($line =~ m/($re)/) {
+                    $found       = 1;
+                    $match       = $1;
+                    $explanation = $expl;
+                    output_explanation($display_filename, $orig_line,
+                        $explanation);
+                }
+            }
+            my $re = '(?<![\$\\\])\$\'[^\']+\'';
+            if ($line =~ m/(.*)($re)/o) {
+                my $count = () = $1 =~ /(^|[^\\])\'/g;
+                if ($count % 2 == 0) {
+                    output_explanation($display_filename, $orig_line,
+                        q<$'...' should be "$(printf '...')">);
+                }
+            }
+            # $cat_line contains the version of the line we'll check
+            # for heredoc delimiters later. Initially, remove any
+            # spaces between << and the delimiter to make the following
+            # updates to $cat_line easier. However, don't remove the
+            # spaces if the delimiter starts with a -, as that changes
+            # how the delimiter is searched.
+            my $cat_line = $line;
+            $cat_line =~ s/(<\<-?)\s+(?!-)/$1/g;
+            # Ignore anything inside single quotes; it could be an
+            # argument to grep or the like.
+            $line =~ s/(^|[^\\\"](?:\\\\)*)\'(?:\\.|[^\\\'])+\'/$1''/g;
+            # As above, with the exception that we don't remove the string
+            # if the quote is immediately preceded by a < or a -, so we
+            # can match "foo <<-?'xyz'" as a heredoc later
+            # The check is a little more greedy than we'd like, but the
+            # heredoc test itself will weed out any false positives
+            $cat_line =~ s/(^|[^<\\\"-](?:\\\\)*)\'(?:\\.|[^\\\'])+\'/$1''/g;
+            $re = '(?<![\$\\\])\$\"[^\"]+\"';
+            if ($line =~ m/(.*)($re)/o) {
+                my $count = () = $1 =~ /(^|[^\\])\"/g;
+                if ($count % 2 == 0) {
+                    output_explanation($display_filename, $orig_line,
+                        q<$"foo" should be eval_gettext "foo">);
+                }
+            }
+            foreach my $re (@string_bashisms_keys) {
+                my $expl = $string_bashisms{$re};
+                if ($line =~ m/($re)/) {
+                    $found       = 1;
+                    $match       = $1;
+                    $explanation = $expl;
+                    output_explanation($display_filename, $orig_line,
+                        $explanation);
+                }
+            }
+            # We've checked for all the things we still want to notice in
+            # double-quoted strings, so now remove those strings as well.
+            $line =~ s/(^|[^\\\'](?:\\\\)*)\"(?:\\.|[^\\\"])+\"/$1""/g;
+            $cat_line =~ s/(^|[^<\\\'-](?:\\\\)*)\"(?:\\.|[^\\\"])+\"/$1""/g;
+            foreach my $re (@bashisms_keys) {
+                my $expl = $bashisms{$re};
+                if ($line =~ m/($re)/) {
+                    $found       = 1;
+                    $match       = $1;
+                    $explanation = $expl;
+                    output_explanation($display_filename, $orig_line,
+                        $explanation);
+                }
+            }
+            # This check requires the value to be compared, which could
+            # be done in the regex itself but requires "use re 'eval'".
+            # So it's better done in its own
+            if ($line =~ m/$LEADIN((?:exit|return)\s+(\d{3,}))/o && $2 > 255) {
+                $explanation = 'exit|return status code greater than 255';
+                output_explanation($display_filename, $orig_line,
+                    $explanation);
+            }
+            # Only look for the beginning of a heredoc here, after we've
+            # stripped out quoted material, to avoid false positives.
+            if ($cat_line
+                =~ m/(?:^|[^<])\<\<(\-?)\s*(?:(?!<|'|")((?:[^\s;>|]+(?:(?<=\\)[\s;>|])?)+)|[\'\"](.*?)[\'\"])/
+            ) {
+                $cat_indented = ($1 && $1 eq '-') ? 1 : 0;
+                my $quoted = defined($3);
+                $cat_string = $quoted ? $3 : $2;
+                unless ($quoted) {
+                    # Now strip backslashes. Keep the position of the
+                    # last match in a variable, as s/// resets it back
+                    # to undef, but we don't want that.
+                    my $pos = 0;
+                    pos($cat_string) = $pos;
+                    while ($cat_string =~ s/\G(.*?)\\/$1/) {
+                        # position += length of match + the character
+                        # that followed the backslash:
+                        $pos += length($1) + 1;
+                        pos($cat_string) = $pos;
+                    }
+                }
+                $start_lines{'cat_string'} = $.;
+            }
+        }
+    }
+    warn
+"error: $display_filename:  Unterminated heredoc found, EOF reached. Wanted: <$cat_string>, opened in line $start_lines{'cat_string'}\n"
+      if ($cat_string ne '');
+    warn
+"error: $display_filename: Unterminated quoted string found, EOF reached. Wanted: <$quote_string>, opened in line $start_lines{'quote_string'}\n"
+      if ($quote_string ne '');
+    warn "error: $display_filename: EOF reached while on line continuation.\n"
+      if ($buffered_line ne '');
+    close C;
+    if ($mode && !$issues) {
+        warn "could not find any possible bashisms in bash script $filename\n";
+        $status |= 4;
+    }
+}
+exit $status;
+sub output_explanation {
+    my ($filename, $line, $explanation) = @_;
+    if ($mode) {
+        # When examining a bash script, just flag that there are indeed
+        # bashisms present
+        $issues = 1;
+    } else {
+        warn "possible bashism in $filename line $. ($explanation):\n$line\n";
+        $status |= 1;
+    }
+}
+# Returns non-zero if the given file is not actually a shell script,
+# just looks like one.
+sub script_is_evil_and_wrong {
+    my ($filename) = @_;
+    my $ret = -1;
+    # lintian's version of this function aborts if the file
+    # can't be opened, but we simply return as the next
+    # test in the calling code handles reporting the error
+    # itself
+    open(IN, '<', $filename) or return $ret;
+    my $i            = 0;
+    my $var          = "0";
+    my $backgrounded = 0;
+    local $_;
+    while (<IN>) {
+        chomp;
+        next if /^#/o;
+        next if /^$/o;
+        last if (++$i > 55);
+        if (
+            m~
+            # the exec should either be "eval"ed or a new statement
+            (^\s*|\beval\s*[\'\"]|(;|&&|\b(then|else))\s*)
+            # eat anything between the exec and $0
+            exec\s*.+\s*
+            # optionally quoted executable name (via $0)
+            .?\$$var.?\s*
+            # optional "end of options" indicator
+            (--\s*)?
+            # Match expressions of the form '${1+$@}', '${1:+"$@"',
+            # '"${1+$@', "$@", etc where the quotes (before the dollar
+            # sign(s)) are optional and the second (or only if the $1
+            # clause is omitted) parameter may be $@ or $*.
+            #
+            # Finally the whole subexpression may be omitted for scripts
+            # which do not pass on their parameters (i.e. after re-execing
+            # they take their parameters (and potentially data) from stdin
+            .?(\$\{1:?\+.?)?(\$(\@|\*))?~x
+        ) {
+            $ret = $. - 1;
+            last;
+        } elsif (/^\s*(\w+)=\$0;/) {
+            $var = $1;
+        } elsif (
+            m~
+            # Match scripts which use "foo $0 $@ &\nexec true\n"
+            # Program name
+            \S+\s+
+            # As above
+            .?\$$var.?\s*
+            (--\s*)?
+            .?(\$\{1:?\+.?)?(\$(\@|\*))?.?\s*\&~x
+        ) {
+            $backgrounded = 1;
+        } elsif (
+            $backgrounded
+            and m~
+            # the exec should either be "eval"ed or a new statement
+            (^\s*|\beval\s*[\'\"]|(;|&&|\b(then|else))\s*)
+            exec\s+true(\s|\Z)~x
+        ) {
+            $ret = $. - 1;
+            last;
+        } elsif (m~\@DPATCH\@~) {
+            $ret = $. - 1;
+            last;
+        }
+    }
+    close IN;
+    return $ret;
+}
+sub init_hashes {
+    %bashisms = (
+        qr'(?:^|\s+)function [^<>\(\)\[\]\{\};|\s]+(\s|\(|\Z)' =>
+          q<'function' is useless>,
+        $LEADIN . qr'select\s+\w+'               => q<'select' is not POSIX>,
+        qr'(test|-o|-a)\s*[^\s]+\s+==\s'         => q<should be 'b = a'>,
+        qr'\[\s+[^\]]+\s+==\s'                   => q<should be 'b = a'>,
+        qr'\s\|\&'                               => q<pipelining is not POSIX>,
+        qr'[^\\\$]\{([^\s\\\}]*?,)+[^\\\}\s]*\}' => q<brace expansion>,
+        qr'\{\d+\.\.\d+(?:\.\.\d+)?\}' =>
+          q<brace expansion, {a..b[..c]}should be $(seq a [c] b)>,
+        qr'(?i)\{[a-z]\.\.[a-z](?:\.\.\d+)?\}' => q<brace expansion>,
+        qr'(?:^|\s+)\w+\[\d+\]='               => q<bash arrays, H[0]>,
+        $LEADIN
+          . qr'read\s+(?:-[a-qs-zA-Z\d-]+)' =>
+          q<read with option other than -r>,
+        $LEADIN
+          . qr'read\s*(?:-\w+\s*)*(?:\".*?\"|[\'].*?[\'])?\s*(?:;|$)' =>
+          q<read without variable>,
+        $LEADIN . qr'echo\s+(-n\s+)?-n?en?\s' => q<echo -e>,
+        $LEADIN . qr'exec\s+-[acl]'           => q<exec -c/-l/-a name>,
+        $LEADIN . qr'let\s'                   => q<let ...>,
+        qr'(?<![\$\(])\(\(.*\)\)'             => q<'((' should be '$(('>,
+        qr'(?:^|\s+)(\[|test)\s+-a' => q<test with unary -a (should be -e)>,
+        qr'\&>'                     => q<should be \>word 2\>&1>,
+        qr'(<\&|>\&)\s*((-|\d+)[^\s;|)}`&\\\\]|[^-\d\s]+(?<!\$)(?!\d))' =>
+          q<should be \>word 2\>&1>,
+        qr'\[\[(?!:)' =>
+          q<alternative test command ([[ foo ]] should be [ foo ])>,
+        qr'/dev/(tcp|udp)'               => q</dev/(tcp|udp)>,
+        $LEADIN . qr'builtin\s'          => q<builtin>,
+        $LEADIN . qr'caller\s'           => q<caller>,
+        $LEADIN . qr'compgen\s'          => q<compgen>,
+        $LEADIN . qr'complete\s'         => q<complete>,
+        $LEADIN . qr'declare\s'          => q<declare>,
+        $LEADIN . qr'dirs(\s|\Z)'        => q<dirs>,
+        $LEADIN . qr'disown\s'           => q<disown>,
+        $LEADIN . qr'enable\s'           => q<enable>,
+        $LEADIN . qr'mapfile\s'          => q<mapfile>,
+        $LEADIN . qr'readarray\s'        => q<readarray>,
+        $LEADIN . qr'shopt(\s|\Z)'       => q<shopt>,
+        $LEADIN . qr'suspend\s'          => q<suspend>,
+        $LEADIN . qr'time\s'             => q<time>,
+        $LEADIN . qr'type\s'             => q<type>,
+        $LEADIN . qr'typeset\s'          => q<typeset>,
+        $LEADIN . qr'ulimit(\s|\Z)'      => q<ulimit>,
+        $LEADIN . qr'set\s+-[BHT]+'      => q<set -[BHT]>,
+        $LEADIN . qr'alias\s+-p'         => q<alias -p>,
+        $LEADIN . qr'unalias\s+-a'       => q<unalias -a>,
+        $LEADIN . qr'local\s+-[a-zA-Z]+' => q<local -opt>,
+        # function '=' is special-cased due to bash arrays (think of "foo=()")
+        qr'(?:^|\s)\s*=\s*\(\s*\)\s*([\{|\(]|\Z)' =>
+          q<function names should only contain [a-z0-9_]>,
+qr'(?:^|\s)(?<func>function\s)?\s*(?:[^<>\(\)\[\]\{\};|\s]*[^<>\(\)\[\]\{\};|\s\w][^<>\(\)\[\]\{\};|\s]*)(?(<func>)(?=)|(?<!=))\s*(?(<func>)(?:\(\s*\))?|\(\s*\))\s*([\{|\(]|\Z)'
+          => q<function names should only contain [a-z0-9_]>,
+        $LEADIN . qr'(push|pop)d(\s|\Z)' => q<(push|pop)d>,
+        $LEADIN . qr'export\s+-[^p]'   => q<export only takes -p as an option>,
+        qr'(?:^|\s+)[<>]\(.*?\)'       => q<\<() process substitution>,
+        $LEADIN . qr'readonly\s+-[af]' => q<readonly -[af]>,
+        $LEADIN . qr'(sh|\$\{?SHELL\}?) -[rD]' => q<sh -[rD]>,
+        $LEADIN . qr'(sh|\$\{?SHELL\}?) --\w+' => q<sh --long-option>,
+        $LEADIN . qr'(sh|\$\{?SHELL\}?) [-+]O' => q<sh [-+]O>,
+        qr'\[\^[^]]+\]'                        => q<[^] should be [!]>,
+        $LEADIN
+          . qr'printf\s+-v' =>
+          q<'printf -v var ...' should be var='$(printf ...)'>,
+        $LEADIN . qr'coproc\s' => q<coproc>,
+        qr';;?&'               => q<;;& and ;& special case operators>,
+        $LEADIN . qr'jobs\s'   => q<jobs>,
+ #      $LEADIN . qr'jobs\s+-[^lp]\s' =>  q<'jobs' with option other than -l or -p>,
+        $LEADIN
+          . qr'command\s+-[^p]\s' => q<'command' with option other than -p>,
+        $LEADIN
+          . qr'setvar\s' =>
+          q<setvar 'foo' 'bar' should be eval 'foo="'"$bar"'"'>,
+        $LEADIN
+          . qr'trap\s+["\']?.*["\']?\s+.*(?:ERR|DEBUG|RETURN)' =>
+          q<trap with ERR|DEBUG|RETURN>,
+        $LEADIN
+          . qr'(?:exit|return)\s+-\d' =>
+          q<exit|return with negative status code>,
+        $LEADIN
+          . qr'(?:exit|return)\s+--' =>
+          q<'exit --' should be 'exit' (idem for return)>,
+        $LEADIN
+          . qr'sleep\s+(?:-|\d+(?:[.a-z]|\s+\d))' =>
+          q<sleep only takes one integer>,
+        $LEADIN . qr'hash(\s|\Z)' => q<hash>,
+        qr'(?:[:=\s])~(?:[+-]|[+-]?\d+)(?:[/\s]|\Z)' =>
+          q<non-standard tilde expansion>,
+    );
+    %string_bashisms = (
+        qr'\$\[[^][]+\]' => q<'$[' should be '$(('>,
+        qr'\$\{(?:\w+|@|\*)\:(?:\d+|\$\{?\w+\}?)+(?::(?:\d+|\$\{?\w+\}?)+)?\}'
+          => q<${foo:3[:1]}>,
+        qr'\$\{!\w+[\@*]\}' => q<${!prefix[*|@]>,
+        qr'\$\{!\w+\}'      => q<${!name}>,
+        qr'\$\{(?:\w+|@|\*)([,^]{1,2}.*?)\}' =>
+          q<${parm,[,][pat]} or ${parm^[^][pat]}>,
+        qr'\$\{[@*]([#%]{1,2}.*?)\}' => q<${[@|*]#[#]pat} or ${[@|*]%[%]pat}>,
+        qr'\$\{#[@*]\}'              => q<${#@} or ${#*}>,
+        qr'\$\{(?:\w+|@|\*)(/.+?){1,2}\}' => q<${parm/?/pat[/str]}>,
+        qr'\$\{\#?\w+\[.+\](?:[/,:#%^].+?)?\}' =>
+          q<bash arrays, ${name[0|*|@]}>,
+        qr'\$\{?RANDOM\}?\b'          => q<$RANDOM>,
+        qr'\$\{?(OS|MACH)TYPE\}?\b'   => q<$(OS|MACH)TYPE>,
+        qr'\$\{?HOST(TYPE|NAME)\}?\b' => q<$HOST(TYPE|NAME)>,
+        qr'\$\{?DIRSTACK\}?\b'        => q<$DIRSTACK>,
+        qr'\$\{?EUID\}?\b'            => q<$EUID should be "$(id -u)">,
+        qr'\$\{?UID\}?\b'             => q<$UID should be "$(id -ru)">,
+        qr'\$\{?SECONDS\}?\b'         => q<$SECONDS>,
+        qr'\$\{?BASH_[A-Z]+\}?\b'     => q<$BASH_SOMETHING>,
+        qr'\$\{?SHELLOPTS\}?\b'       => q<$SHELLOPTS>,
+        qr'\$\{?PIPESTATUS\}?\b'      => q<$PIPESTATUS>,
+        qr'\$\{?SHLVL\}?\b'           => q<$SHLVL>,
+        qr'\$\{?FUNCNAME\}?\b'        => q<$FUNCNAME>,
+        qr'\$\{?TMOUT\}?\b'           => q<$TMOUT>,
+        qr'(?:^|\s+)TMOUT='           => q<TMOUT=>,
+        qr'\$\{?TIMEFORMAT\}?\b'      => q<$TIMEFORMAT>,
+        qr'(?:^|\s+)TIMEFORMAT='      => q<TIMEFORMAT=>,
+        qr'(?<![$\\])\$\{?_\}?\b'     => q<$_>,
+        qr'(?:^|\s+)GLOBIGNORE='      => q<GLOBIGNORE=>,
+        qr'<<<'                       => q<\<\<\< here string>,
+        $LEADIN
+          . qr'echo\s+(?:-[^e\s]+\s+)?\"[^\"]*(\\[abcEfnrtv0])+.*?[\"]' =>
+          q<unsafe echo with backslash>,
+        qr'\$\(\([\s\w$*/+-]*\w\+\+.*?\)\)' =>
+          q<'$((n++))' should be '$n; $((n=n+1))'>,
+        qr'\$\(\([\s\w$*/+-]*\+\+\w.*?\)\)' =>
+          q<'$((++n))' should be '$((n=n+1))'>,
+        qr'\$\(\([\s\w$*/+-]*\w\-\-.*?\)\)' =>
+          q<'$((n--))' should be '$n; $((n=n-1))'>,
+        qr'\$\(\([\s\w$*/+-]*\-\-\w.*?\)\)' =>
+          q<'$((--n))' should be '$((n=n-1))'>,
+        qr'\$\(\([\s\w$*/+-]*\*\*.*?\)\)' => q<exponentiation is not POSIX>,
+        $LEADIN . qr'printf\s["\'][^"\']*?%q.+?["\']' => q<printf %q>,
+    );
+    %singlequote_bashisms = (
+        $LEADIN
+          . qr'echo\s+(?:-[^e\s]+\s+)?\'[^\']*(\\[abcEfnrtv0])+.*?[\']' =>
+          q<unsafe echo with backslash>,
+        $LEADIN
+          . qr'source\s+[\"\']?(?:\.\/|\/|\$|[\w~.-])\S*' =>
+          q<should be '.', not 'source'>,
+    );
+    if ($opt_echo) {
+        $bashisms{ $LEADIN . qr'echo\s+-[A-Za-z]*n' } = q<echo -n>;
+    }
+    if ($opt_posix) {
+        $bashisms{ $LEADIN . qr'local\s+\w+(\s+\W|\s*[;&|)]|$)' }
+          = q<local foo>;
+        $bashisms{ $LEADIN . qr'local\s+\w+=' }      = q<local foo=bar>;
+        $bashisms{ $LEADIN . qr'local\s+\w+\s+\w+' } = q<local x y>;
+        $bashisms{ $LEADIN . qr'((?:test|\[)\s+.+\s-[ao])\s' } = q<test -a/-o>;
+        $bashisms{ $LEADIN . qr'kill\s+-[^sl]\w*' } = q<kill -[0-9] or -[A-Z]>;
+        $bashisms{ $LEADIN . qr'trap\s+["\']?.*["\']?\s+.*[1-9]' }
+          = q<trap with signal numbers>;
+    }
+    if ($makefile) {
+        $string_bashisms{qr'(\$\(|\`)\s*\<\s*([^\s\)]{2,}|[^DF])\s*(\)|\`)'}
+          = q<'$(\< foo)' should be '$(cat foo)'>;
+    } else {
+        $bashisms{ $LEADIN . qr'\w+\+=' } = q<should be VAR="${VAR}foo">;
+        $string_bashisms{qr'(\$\(|\`)\s*\<\s*\S+\s*(\)|\`)'}
+          = q<'$(\< foo)' should be '$(cat foo)'>;
+    }
+    if ($opt_extra) {
+        $string_bashisms{qr'\$\{?BASH\}?\b'}            = q<$BASH>;
+        $string_bashisms{qr'(?:^|\s+)RANDOM='}          = q<RANDOM=>;
+        $string_bashisms{qr'(?:^|\s+)(OS|MACH)TYPE='}   = q<(OS|MACH)TYPE=>;
+        $string_bashisms{qr'(?:^|\s+)HOST(TYPE|NAME)='} = q<HOST(TYPE|NAME)=>;
+        $string_bashisms{qr'(?:^|\s+)DIRSTACK='}        = q<DIRSTACK=>;
+        $string_bashisms{qr'(?:^|\s+)EUID='}            = q<EUID=>;
+        $string_bashisms{qr'(?:^|\s+)UID='}             = q<UID=>;
+        $string_bashisms{qr'(?:^|\s+)BASH(_[A-Z]+)?='}  = q<BASH(_SOMETHING)=>;
+        $string_bashisms{qr'(?:^|\s+)SHELLOPTS='}       = q<SHELLOPTS=>;
+        $string_bashisms{qr'\$\{?POSIXLY_CORRECT\}?\b'} = q<$POSIXLY_CORRECT>;
+    }
+}
diff --git a/m4/perl.m4 b/m4/perl.m4
new file mode 100644
index 000000000..6f855c7a6
--- /dev/null
+++ b/m4/perl.m4
@@ -0,0 +1,48 @@
+# serial 9
+dnl From Jim Meyering.
+dnl Find a new-enough version of Perl.
+# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2018 Free Software Foundation,
+# Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# GNUnet e.V. comment of origin: gnulib
+AC_DEFUN([gl_PERL],
+[
+  dnl FIXME: don't hard-code 5.005
+  AC_MSG_CHECKING([for perl5.005 or newer])
+  if test "${PERL+set}" = set; then
+    # 'PERL' is set in the user's environment.
+    candidate_perl_names="$PERL"
+    perl_specified=yes
+  else
+    candidate_perl_names='perl perl5'
+    perl_specified=no
+  fi
+  found=no
+  AC_SUBST([PERL])
+  PERL="$am_missing_run perl"
+  for perl in $candidate_perl_names; do
+    # Run test in a subshell; some versions of sh will print an error if
+    # an executable is not found, even if stderr is redirected.
+    if ( $perl -e 'require 5.005; use File::Compare' ) > /dev/null 2>&1; then
+      PERL=$perl
+      found=yes
+      break
+    fi
+  done
+  AC_MSG_RESULT([$found])
+  test $found = no && AC_MSG_WARN([
+WARNING: You don't seem to have perl5.005 or newer installed, or you lack
+         a usable version of the Perl File::Compare module.  As a result,
+         you may be unable to run a few tests or to regenerate certain
+         files if you modify the sources from which they are derived.
+] )
+])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index deeffe180..67c22aaed 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,14 +4,6 @@ src/arm/arm_monitor_api.c
 src/arm/gnunet-arm.c
 src/arm/gnunet-service-arm.c
 src/arm/mockup-service.c
-src/ats-tests/ats-testing-experiment.c
-src/ats-tests/ats-testing-log.c
-src/ats-tests/ats-testing-preferences.c
-src/ats-tests/ats-testing-traffic.c
-src/ats-tests/ats-testing.c
-src/ats-tests/gnunet-ats-sim.c
-src/ats-tests/gnunet-solver-eval.c
-src/ats-tool/gnunet-ats.c
 src/ats/ats_api2_application.c
 src/ats/ats_api2_transport.c
 src/ats/ats_api_connectivity.c
@@ -19,10 +11,10 @@ src/ats/ats_api_performance.c
 src/ats/ats_api_scanner.c
 src/ats/ats_api_scheduling.c
 src/ats/gnunet-ats-solver-eval.c
-src/ats/gnunet-service-ats-new.c
-src/ats/gnunet-service-ats.c
 src/ats/gnunet-service-ats_addresses.c
+src/ats/gnunet-service-ats.c
 src/ats/gnunet-service-ats_connectivity.c
+src/ats/gnunet-service-ats-new.c
 src/ats/gnunet-service-ats_normalization.c
 src/ats/gnunet-service-ats_performance.c
 src/ats/gnunet-service-ats_plugins.c
@@ -34,6 +26,14 @@ src/ats/plugin_ats2_simple.c
 src/ats/plugin_ats_mlp.c
 src/ats/plugin_ats_proportional.c
 src/ats/plugin_ats_ril.c
+src/ats-tests/ats-testing.c
+src/ats-tests/ats-testing-experiment.c
+src/ats-tests/ats-testing-log.c
+src/ats-tests/ats-testing-preferences.c
+src/ats-tests/ats-testing-traffic.c
+src/ats-tests/gnunet-ats-sim.c
+src/ats-tests/gnunet-solver-eval.c
+src/ats-tool/gnunet-ats.c
 src/auction/gnunet-auction-create.c
 src/auction/gnunet-auction-info.c
 src/auction/gnunet-auction-join.c
@@ -50,8 +50,8 @@ src/cadet/cadet_api_list_peers.c
 src/cadet/cadet_api_list_tunnels.c
 src/cadet/cadet_test_lib.c
 src/cadet/desirability_table.c
-src/cadet/gnunet-cadet-profiler.c
 src/cadet/gnunet-cadet.c
+src/cadet/gnunet-cadet-profiler.c
 src/cadet/gnunet-service-cadet.c
 src/cadet/gnunet-service-cadet_channel.c
 src/cadet/gnunet-service-cadet_connection.c
@@ -67,15 +67,15 @@ src/consensus/gnunet-service-consensus.c
 src/consensus/plugin_block_consensus.c
 src/conversation/conversation_api.c
 src/conversation/conversation_api_call.c
-src/conversation/gnunet-conversation-test.c
 src/conversation/gnunet-conversation.c
-src/conversation/gnunet-helper-audio-playback-gst.c
+src/conversation/gnunet-conversation-test.c
+src/conversation/gnunet_gst.c
+src/conversation/gnunet_gst_test.c
 src/conversation/gnunet-helper-audio-playback.c
-src/conversation/gnunet-helper-audio-record-gst.c
+src/conversation/gnunet-helper-audio-playback-gst.c
 src/conversation/gnunet-helper-audio-record.c
+src/conversation/gnunet-helper-audio-record-gst.c
 src/conversation/gnunet-service-conversation.c
-src/conversation/gnunet_gst.c
-src/conversation/gnunet_gst_test.c
 src/conversation/microphone.c
 src/conversation/plugin_gnsrecord_conversation.c
 src/conversation/speaker.c
@@ -92,6 +92,7 @@ src/credential/credential_serialization.c
 src/credential/gnunet-credential.c
 src/credential/gnunet-service-credential.c
 src/credential/plugin_gnsrecord_credential.c
+src/credential/plugin_rest_credential.c
 src/curl/curl.c
 src/curl/curl_reschedule.c
 src/datacache/datacache.c
@@ -111,6 +112,7 @@ src/dht/dht_api.c
 src/dht/dht_test_lib.c
 src/dht/gnunet-dht-get.c
 src/dht/gnunet-dht-monitor.c
+src/dht/gnunet_dht_profiler.c
 src/dht/gnunet-dht-put.c
 src/dht/gnunet-service-dht.c
 src/dht/gnunet-service-dht_clients.c
@@ -119,7 +121,6 @@ src/dht/gnunet-service-dht_hello.c
 src/dht/gnunet-service-dht_neighbours.c
 src/dht/gnunet-service-dht_nse.c
 src/dht/gnunet-service-dht_routing.c
-src/dht/gnunet_dht_profiler.c
 src/dht/plugin_block_dht.c
 src/dns/dns_api.c
 src/dns/gnunet-dns-monitor.c
@@ -129,8 +130,8 @@ src/dns/gnunet-service-dns.c
 src/dns/gnunet-zonewalk.c
 src/dns/plugin_block_dns.c
 src/exit/gnunet-daemon-exit.c
-src/exit/gnunet-helper-exit-windows.c
 src/exit/gnunet-helper-exit.c
+src/exit/gnunet-helper-exit-windows.c
 src/fragmentation/defragmentation.c
 src/fragmentation/fragmentation.c
 src/fs/fs_api.c
@@ -155,8 +156,8 @@ src/fs/gnunet-auto-share.c
 src/fs/gnunet-daemon-fsprofiler.c
 src/fs/gnunet-directory.c
 src/fs/gnunet-download.c
-src/fs/gnunet-fs-profiler.c
 src/fs/gnunet-fs.c
+src/fs/gnunet-fs-profiler.c
 src/fs/gnunet-helper-fs-publish.c
 src/fs/gnunet-publish.c
 src/fs/gnunet-search.c
@@ -176,10 +177,10 @@ src/gns/gns_tld_api.c
 src/gns/gnunet-bcd.c
 src/gns/gnunet-dns2gns.c
 src/gns/gnunet-gns-benchmark.c
+src/gns/gnunet-gns.c
 src/gns/gnunet-gns-helper-service-w32.c
 src/gns/gnunet-gns-import.c
 src/gns/gnunet-gns-proxy.c
-src/gns/gnunet-gns.c
 src/gns/gnunet-service-gns.c
 src/gns/gnunet-service-gns_interceptor.c
 src/gns/gnunet-service-gns_resolver.c
@@ -187,19 +188,20 @@ src/gns/nss/nss_gns.c
 src/gns/nss/nss_gns_query.c
 src/gns/plugin_block_gns.c
 src/gns/plugin_gnsrecord_gns.c
-src/gns/w32nsp-install.c
+src/gns/plugin_rest_gns.c
-src/gns/w32nsp-resolve.c
-src/gns/w32nsp-uninstall.c
-src/gns/w32nsp.c
 src/gnsrecord/gnsrecord.c
 src/gnsrecord/gnsrecord_crypto.c
 src/gnsrecord/gnsrecord_misc.c
 src/gnsrecord/gnsrecord_serialization.c
 src/gnsrecord/plugin_gnsrecord_dns.c
+src/gns/w32nsp.c
+src/gns/w32nsp-install.c
+src/gns/w32nsp-resolve.c
+src/gns/w32nsp-uninstall.c
 src/hello/address.c
 src/hello/gnunet-hello.c
-src/hello/hello-ng.c
 src/hello/hello.c
+src/hello/hello-ng.c
 src/hostlist/gnunet-daemon-hostlist.c
 src/hostlist/gnunet-daemon-hostlist_client.c
 src/hostlist/gnunet-daemon-hostlist_server.c
@@ -207,6 +209,7 @@ src/identity/gnunet-identity.c
 src/identity/gnunet-service-identity.c
 src/identity/identity_api.c
 src/identity/identity_api_lookup.c
+src/identity/plugin_rest_identity.c
 src/json/json.c
 src/json/json_generator.c
 src/json/json_gnsrecord.c
@@ -222,8 +225,8 @@ src/namecache/namecache_api.c
 src/namecache/plugin_namecache_flat.c
 src/namecache/plugin_namecache_postgres.c
 src/namecache/plugin_namecache_sqlite.c
-src/namestore/gnunet-namestore-fcfsd.c
 src/namestore/gnunet-namestore.c
+src/namestore/gnunet-namestore-fcfsd.c
 src/namestore/gnunet-service-namestore.c
 src/namestore/gnunet-zoneimport.c
 src/namestore/namestore_api.c
@@ -231,6 +234,7 @@ src/namestore/namestore_api_monitor.c
 src/namestore/plugin_namestore_heap.c
 src/namestore/plugin_namestore_postgres.c
 src/namestore/plugin_namestore_sqlite.c
+src/namestore/plugin_rest_namestore.c
 src/nat-auto/gnunet-nat-auto.c
 src/nat-auto/gnunet-nat-auto_legacy.c
 src/nat-auto/gnunet-nat-server.c
@@ -238,10 +242,10 @@ src/nat-auto/gnunet-service-nat-auto.c
 src/nat-auto/gnunet-service-nat-auto_legacy.c
 src/nat-auto/nat_auto_api.c
 src/nat-auto/nat_auto_api_test.c
-src/nat/gnunet-helper-nat-client-windows.c
 src/nat/gnunet-helper-nat-client.c
-src/nat/gnunet-helper-nat-server-windows.c
+src/nat/gnunet-helper-nat-client-windows.c
 src/nat/gnunet-helper-nat-server.c
+src/nat/gnunet-helper-nat-server-windows.c
 src/nat/gnunet-nat.c
 src/nat/gnunet-service-nat.c
 src/nat/gnunet-service-nat_externalip.c
@@ -250,16 +254,17 @@ src/nat/gnunet-service-nat_mini.c
 src/nat/gnunet-service-nat_stun.c
 src/nat/nat_api.c
 src/nat/nat_api_stun.c
-src/nse/gnunet-nse-profiler.c
 src/nse/gnunet-nse.c
+src/nse/gnunet-nse-profiler.c
 src/nse/gnunet-service-nse.c
 src/nse/nse_api.c
 src/nt/nt.c
-src/peerinfo-tool/gnunet-peerinfo.c
-src/peerinfo-tool/gnunet-peerinfo_plugins.c
 src/peerinfo/gnunet-service-peerinfo.c
 src/peerinfo/peerinfo_api.c
 src/peerinfo/peerinfo_api_notify.c
+src/peerinfo/plugin_rest_peerinfo.c
+src/peerinfo-tool/gnunet-peerinfo.c
+src/peerinfo-tool/gnunet-peerinfo_plugins.c
 src/peerstore/gnunet-peerstore.c
 src/peerstore/gnunet-service-peerstore.c
 src/peerstore/peerstore_api.c
@@ -278,8 +283,12 @@ src/reclaim-attribute/plugin_reclaim_attribute_gnuid.c
 src/reclaim-attribute/reclaim_attribute.c
 src/reclaim/gnunet-reclaim.c
 src/reclaim/gnunet-service-reclaim.c
+src/reclaim/json_reclaim.c
+src/reclaim/oidc_helper.c
 src/reclaim/plugin_gnsrecord_reclaim.c
 src/reclaim/plugin_reclaim_sqlite.c
+src/reclaim/plugin_rest_openid_connect.c
+src/reclaim/plugin_rest_reclaim.c
 src/reclaim/reclaim_api.c
 src/regex/gnunet-daemon-regexprofiler.c
 src/regex/gnunet-regex-profiler.c
@@ -295,38 +304,29 @@ src/regex/regex_internal_dht.c
 src/regex/regex_test_graph.c
 src/regex/regex_test_lib.c
 src/regex/regex_test_random.c
-src/rest-plugins/json_reclaim.c
-src/rest-plugins/oidc_helper.c
-src/rest-plugins/plugin_rest_copying.c
-src/rest-plugins/plugin_rest_credential.c
-src/rest-plugins/plugin_rest_gns.c
-src/rest-plugins/plugin_rest_identity.c
-src/rest-plugins/plugin_rest_namestore.c
-src/rest-plugins/plugin_rest_openid_connect.c
-src/rest-plugins/plugin_rest_peerinfo.c
-src/rest-plugins/plugin_rest_reclaim.c
 src/rest/gnunet-rest-server.c
+src/rest/plugin_rest_copying.c
 src/rest/rest.c
 src/revocation/gnunet-revocation.c
 src/revocation/gnunet-service-revocation.c
 src/revocation/plugin_block_revocation.c
 src/revocation/revocation_api.c
-src/rps/gnunet-rps-profiler.c
 src/rps/gnunet-rps.c
+src/rps/gnunet-rps-profiler.c
 src/rps/gnunet-service-rps.c
 src/rps/gnunet-service-rps_custommap.c
 src/rps/gnunet-service-rps_sampler.c
 src/rps/gnunet-service-rps_sampler_elem.c
 src/rps/gnunet-service-rps_view.c
+src/rps/rps_api.c
 src/rps/rps-sampler_client.c
 src/rps/rps-sampler_common.c
 src/rps/rps-test_util.c
-src/rps/rps_api.c
 src/scalarproduct/gnunet-scalarproduct.c
-src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
-src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
 src/scalarproduct/gnunet-service-scalarproduct_alice.c
 src/scalarproduct/gnunet-service-scalarproduct_bob.c
+src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
+src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
 src/scalarproduct/scalarproduct_api.c
 src/secretsharing/gnunet-secretsharing-profiler.c
 src/secretsharing/gnunet-service-secretsharing.c
@@ -352,16 +352,15 @@ src/statistics/gnunet-statistics.c
 src/statistics/statistics_api.c
 src/template/gnunet-service-template.c
 src/template/gnunet-template.c
-src/testbed-logger/gnunet-service-testbed-logger.c
-src/testbed-logger/testbed_logger_api.c
 src/testbed/generate-underlay-topology.c
 src/testbed/gnunet-daemon-latency-logger.c
 src/testbed/gnunet-daemon-testbed-blacklist.c
 src/testbed/gnunet-daemon-testbed-underlay.c
 src/testbed/gnunet-helper-testbed.c
+src/testbed/gnunet_mpi_test.c
 src/testbed/gnunet-service-test-barriers.c
-src/testbed/gnunet-service-testbed.c
 src/testbed/gnunet-service-testbed_barriers.c
+src/testbed/gnunet-service-testbed.c
 src/testbed/gnunet-service-testbed_cache.c
 src/testbed/gnunet-service-testbed_connectionpool.c
 src/testbed/gnunet-service-testbed_cpustatus.c
@@ -369,19 +368,20 @@ src/testbed/gnunet-service-testbed_links.c
 src/testbed/gnunet-service-testbed_meminfo.c
 src/testbed/gnunet-service-testbed_oc.c
 src/testbed/gnunet-service-testbed_peers.c
-src/testbed/gnunet-testbed-profiler.c
-src/testbed/gnunet_mpi_test.c
 src/testbed/gnunet_testbed_mpi_spawn.c
-src/testbed/testbed_api.c
+src/testbed/gnunet-testbed-profiler.c
+src/testbed-logger/gnunet-service-testbed-logger.c
+src/testbed-logger/testbed_logger_api.c
 src/testbed/testbed_api_barriers.c
+src/testbed/testbed_api.c
 src/testbed/testbed_api_hosts.c
 src/testbed/testbed_api_operations.c
 src/testbed/testbed_api_peers.c
 src/testbed/testbed_api_sd.c
 src/testbed/testbed_api_services.c
 src/testbed/testbed_api_statistics.c
-src/testbed/testbed_api_test.c
 src/testbed/testbed_api_testbed.c
+src/testbed/testbed_api_test.c
 src/testbed/testbed_api_topology.c
 src/testbed/testbed_api_underlay.c
 src/testing/gnunet-testing.c
@@ -393,29 +393,29 @@ src/transport/gnunet-communicator-tcp.c
 src/transport/gnunet-communicator-udp.c
 src/transport/gnunet-communicator-unix.c
 src/transport/gnunet-helper-transport-bluetooth.c
-src/transport/gnunet-helper-transport-wlan-dummy.c
 src/transport/gnunet-helper-transport-wlan.c
+src/transport/gnunet-helper-transport-wlan-dummy.c
 src/transport/gnunet-service-tng.c
-src/transport/gnunet-service-transport.c
 src/transport/gnunet-service-transport_ats.c
+src/transport/gnunet-service-transport.c
 src/transport/gnunet-service-transport_hello.c
 src/transport/gnunet-service-transport_manipulation.c
 src/transport/gnunet-service-transport_neighbours.c
 src/transport/gnunet-service-transport_plugins.c
 src/transport/gnunet-service-transport_validation.c
+src/transport/gnunet-transport.c
 src/transport/gnunet-transport-certificate-creation.c
 src/transport/gnunet-transport-profiler.c
 src/transport/gnunet-transport-wlan-receiver.c
 src/transport/gnunet-transport-wlan-sender.c
-src/transport/gnunet-transport.c
 src/transport/plugin_transport_http_client.c
 src/transport/plugin_transport_http_common.c
 src/transport/plugin_transport_http_server.c
 src/transport/plugin_transport_smtp.c
 src/transport/plugin_transport_tcp.c
 src/transport/plugin_transport_template.c
-src/transport/plugin_transport_udp.c
 src/transport/plugin_transport_udp_broadcasting.c
+src/transport/plugin_transport_udp.c
 src/transport/plugin_transport_unix.c
 src/transport/plugin_transport_wlan.c
 src/transport/plugin_transport_xt.c
@@ -424,11 +424,6 @@ src/transport/tcp_connection_legacy.c
 src/transport/tcp_server_legacy.c
 src/transport/tcp_server_mst_legacy.c
 src/transport/tcp_service_legacy.c
-src/transport/transport-testing-filenames.c
-src/transport/transport-testing-loggers.c
-src/transport/transport-testing-main.c
-src/transport/transport-testing-send.c
-src/transport/transport-testing.c
 src/transport/transport_api2_address.c
 src/transport/transport_api2_communication.c
 src/transport/transport_api2_core.c
@@ -441,6 +436,11 @@ src/transport/transport_api_manipulation.c
 src/transport/transport_api_monitor_peers.c
 src/transport/transport_api_monitor_plugins.c
 src/transport/transport_api_offer_hello.c
+src/transport/transport-testing.c
+src/transport/transport-testing-filenames.c
+src/transport/transport-testing-loggers.c
+src/transport/transport-testing-main.c
+src/transport/transport-testing-send.c
 src/util/bandwidth.c
 src/util/benchmark.c
 src/util/bio.c
@@ -453,8 +453,8 @@ src/util/configuration_loader.c
 src/util/container_bloomfilter.c
 src/util/container_heap.c
 src/util/container_meta_data.c
-src/util/container_multihashmap.c
 src/util/container_multihashmap32.c
+src/util/container_multihashmap.c
 src/util/container_multipeermap.c
 src/util/container_multishortmap.c
 src/util/crypto_abe.c
@@ -476,16 +476,16 @@ src/util/dnsparser.c
 src/util/dnsstub.c
 src/util/getopt.c
 src/util/getopt_helpers.c
-src/util/gnunet-config-diff.c
 src/util/gnunet-config.c
+src/util/gnunet-config-diff.c
 src/util/gnunet-ecc.c
 src/util/gnunet-helper-w32-console.c
 src/util/gnunet-qr.c
 src/util/gnunet-resolver.c
 src/util/gnunet-scrypt.c
 src/util/gnunet-service-resolver.c
-src/util/gnunet-timeout-w32.c
 src/util/gnunet-timeout.c
+src/util/gnunet-timeout-w32.c
 src/util/gnunet-uri.c
 src/util/helper.c
 src/util/load.c
@@ -514,13 +514,13 @@ src/util/tun.c
 src/util/w32cat.c
 src/util/win.c
 src/util/winproc.c
-src/vpn/gnunet-helper-vpn-windows.c
 src/vpn/gnunet-helper-vpn.c
+src/vpn/gnunet-helper-vpn-windows.c
 src/vpn/gnunet-service-vpn.c
 src/vpn/gnunet-vpn.c
 src/vpn/vpn_api.c
-src/zonemaster/gnunet-service-zonemaster-monitor.c
 src/zonemaster/gnunet-service-zonemaster.c
+src/zonemaster/gnunet-service-zonemaster-monitor.c
 src/fs/fs_api.h
 src/include/compat.h
 src/include/gnunet_common.h
diff --git a/pre-commit b/pre-commit
index 777728a6b..c67fcaf0c 100755
--- a/pre-commit
+++ b/pre-commit
@@ -2,6 +2,8 @@
 # Run this script to indent the GNUnet code.  When run without arguments,
 # it indents the ENTIRE src/ tree.  Run with 'src/XXX' to indent the
 # src/XXX directory.
+#
+# This script is in the public domain.
 if test $# = 0
 then
 PATHS=src/
@@ -12,10 +14,9 @@ find $PATHS -name "*.c" -exec indent {} \;
 find $PATHS -name "*.h" -exec indent {} \;
 find $PATHS -name "*.c" -exec indent {} \;
 find $PATHS -name "*.h" -exec indent {} \;
-find $PATHS -name "*.c" -exec contrib/removetrailingwhitespace.py {} \;
+find $PATHS -name "*.c" -exec contrib/scripts/removetrailingwhitespace.py {} \;
-find $PATHS -name "*.h" -exec contrib/removetrailingwhitespace.py {} \;
+find $PATHS -name "*.h" -exec contrib/scripts/removetrailingwhitespace.py {} \;
-if test -x "`which 'dos2unix'`"
+if test -n "`dos2unix -V | head -n1 | awk '{print $1 $2}'`"; then
-then
  find $PATHS -name "*.c" -exec dos2unix {} \;
  find $PATHS -name "*.h" -exec dos2unix {} \;
 fi
diff --git a/src/Makefile.am b/src/Makefile.am
index 03738e4ed..c1c708aa6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,7 +60,7 @@ endif
 if HAVE_MHD
 if HAVE_JSON
- REST_DIR = rest rest-plugins
+ REST_DIR = rest
 endif
 endif
@@ -81,6 +81,8 @@ SUBDIRS = \
  statistics \
  arm \
  $(TESTING) \
+  $(JSON_DIR) \
+  $(REST_DIR) \
  peerinfo \
  $(SQLITE_DIR) \
  $(MYSQL_DIR) \
@@ -121,9 +123,7 @@ SUBDIRS = \
  exit \
  pt \
  secretsharing \
-        $(EXP_DIR) \
+  $(EXP_DIR) \
-  $(JSON_DIR) \
-  $(REST_DIR) \
  integration-tests
 endif
diff --git a/src/arm/test_gnunet_arm.py.in b/src/arm/test_gnunet_arm.py.in
index 10bb58a9c..1d067b5d9 100644
--- a/src/arm/test_gnunet_arm.py.in
+++ b/src/arm/test_gnunet_arm.py.in
@@ -1,5 +1,5 @@
 #!@PYTHON@
-from __future__ import print_function
 import os
 import sys
 import shutil
diff --git a/src/cadet/loopcheck.sh b/src/cadet/loopcheck.sh
index ddc8c191c..9b867e95b 100755
--- a/src/cadet/loopcheck.sh
+++ b/src/cadet/loopcheck.sh
@@ -1,4 +1,41 @@
-#!/bin/sh
+#!/usr/bin/env bash
+# This script is in the public domain
+# POSIX shell solution for named pipes and pipestatus,
+# http://shell.cfajohnson.com/cus-faq-2.html#Q11
+# run() {
+#     j=1
+#     while eval "\${pipestatus_$j+:} false"; do
+#         unset pipestatus_$j
+#         j=$(($j+1))
+#     done
+#     j=1 com= k=1 l=
+#     for a; do
+#         if [ "x$a" = 'x|' ]; then
+#             com="$com { $l "'3>&-
+#                          echo "pipestatus_'$j'=$?" >&3
+#                        } 4>&- |'
+#             j=$(($j+1)) l=
+#         else
+#             l="$l \"\$$k\""
+#         fi
+#         k=$(($k+1))
+#     done
+#     com="$com $l"' 3>&- >&4 4>&-
+#                     echo "pipestatus_'$j'=$?"'
+#     exec 4>&1
+#     eval "$(exec 3>&1; eval "$com")"
+#     exec 4>&-
+#     j=1
+#     while eval "\${pipestatus_$j+:} false"; do
+#         eval "[ \$pipestatus_$j -eq 0 ]" || return 1
+#         j=$(($j+1))
+#     done
+#     return 0
+# }
+# # https://mywiki.wooledge.org/Bashism has another solution:
+# # mkfifo fifo; command2 <fifo & command1 >fifo; echo "$?"
 while true; do
    if [ "$1" = "" ]; then
        echo All
@@ -7,6 +44,7 @@ while true; do
        echo One
        LOGFILE="test_`date "+%m.%d-%H:%M:%S"`.log"
        taskset 01 $1 2>&1 | tee $LOGFILE | grep -v DEBUG;
+        # TODO: Replace $PIPESTATUS with more portable code
        if [ "${PIPESTATUS[0]}" != "0" ]; then
            echo "Failed";
            date;
@@ -15,5 +53,5 @@ while true; do
    fi
    grep cadet test_*.log | grep -B 10 ERROR && break
    grep cadet test_*.log | grep -B 10 Assert && break
-    ls core* &> /dev/null && break
+    ls core* > /dev/null 2>&1 && break
 done
diff --git a/src/cadet/run_profiler.sh b/src/cadet/run_profiler.sh
index 81ea4a761..4273dcd27 100755
--- a/src/cadet/run_profiler.sh
+++ b/src/cadet/run_profiler.sh
@@ -22,4 +22,4 @@ echo "using $PEERS peers, $LINKS links";
    
 sed -e "s/%LINKS%/$LINKS/;s/%NSE%/$NSE/" profiler.conf > .profiler.conf
-./gnunet-cadet-profiler $ROUNDTIME $PEERS $PINGS $4 |& tee log | grep -v DEBUG
+./gnunet-cadet-profiler $ROUNDTIME $PEERS $PINGS $4 2>&1 | tee log | grep -v DEBUG
diff --git a/src/consensus/consensus-simulation.py.in b/src/consensus/consensus-simulation.py.in
index 161015d00..39daf81c6 100644
--- a/src/consensus/consensus-simulation.py.in
+++ b/src/consensus/consensus-simulation.py.in
@@ -17,16 +17,9 @@
 #
 # SPDX-License-Identifier: AGPL3.0-or-later
-from __future__ import absolute_import
-from __future__ import print_function
-from __future__ import division
-from builtins import str
-from builtins import range
-from past.utils import old_div
 import argparse
 import random
 from math import ceil, log, floor
-from past.builtins import xrange
 def bsc(n):
@@ -43,14 +36,12 @@ def bsc(n):
 def simulate(k, n, verbose):
    assert k < n
-    largest_arc = old_div(int(2**ceil(log(n, 2))), 2)
+    largest_arc = int(2**ceil(log(n, 2))) // 2
    num_ghosts = (2 * largest_arc) - n
    if verbose:
        print("we have", num_ghosts, "ghost peers")
        # n.b. all peers with idx<k are evil
    peers = list(range(n))
-    # py2-3 compatible, backwards.
-    # refer to http://python-future.org/compatible_idioms.html#xrange
    info = [1 << x for x in range(n)]
    def done_p():
@@ -111,4 +102,4 @@ if __name__ == "__main__":
    sum = 0.0
    for n in range(0, args.r):
        sum += simulate(args.k, args.n, args.verbose)
-    print(old_div(sum, args.r))
+    print(sum // args.r)
diff --git a/src/conversation/test.sh b/src/conversation/test.sh
index ca4d15ac1..20e82bc88 100644
--- a/src/conversation/test.sh
+++ b/src/conversation/test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 export GST_DEBUG_DUMP_DOT_DIR=/tmp/ 
 GST_DEBUG_DUMP_DOT_DIR=/tmp/ ./gnunet-helper-audio-record |GST_DEBUG_DUMP_DOT_DIR=/tmp/ ./gnunet-helper-audio-playback
diff --git a/src/credential/Makefile.am b/src/credential/Makefile.am
index b96e33b5c..aaac0d2c2 100644
--- a/src/credential/Makefile.am
+++ b/src/credential/Makefile.am
@@ -90,3 +90,19 @@ if HAVE_SQLITE
 TESTS = $(check_SCRIPTS)
 endif
 endif
+#libgnunet_plugin_rest_credential_la_SOURCES = \
+#  plugin_rest_credential.c
+#libgnunet_plugin_rest_credential_la_LIBADD = \
+#  $(top_builddir)/src/credential/libgnunetcredential.la \
+#       $(top_builddir)/src/rest/libgnunetrest.la \
+#       $(top_builddir)/src/identity/libgnunetidentity.la \
+#  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+#  $(LTLIBINTL) -ljansson -lmicrohttpd
+#libgnunet_plugin_rest_credential_la_LDFLAGS = \
+# $(GN_PLUGIN_LDFLAGS)
diff --git a/src/rest-plugins/plugin_rest_credential.c b/src/credential/plugin_rest_credential.c
index 78267b54e..78267b54e 100644
--- a/src/rest-plugins/plugin_rest_credential.c
+++ b/src/credential/plugin_rest_credential.c
diff --git a/src/credential/test_credential_collect.sh b/src/credential/test_credential_collect.sh
index 6c713063f..0ae063eda 100755
--- a/src/credential/test_credential_collect.sh
+++ b/src/credential/test_credential_collect.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
@@ -20,7 +20,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f`
 #  (3) PKEY3.user -> PKEY4
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 TEST_ATTR="test"
 TEST_ATTR2="test2"
diff --git a/src/credential/test_credential_collect_rest.sh b/src/credential/test_credential_collect_rest.sh
index 0b31f85bc..fe59d9399 100755
--- a/src/credential/test_credential_collect_rest.sh
+++ b/src/credential/test_credential_collect_rest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
@@ -22,7 +22,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f`
 #  (5) GNUnet.developer -> Alice
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 gnunet-arm -s -c test_credential_lookup.conf
 gnunet-identity -C service -c test_credential_lookup.conf
 gnunet-identity -C alice -c test_credential_lookup.conf
@@ -82,9 +82,10 @@ gnunet-arm -e -c test_credential_lookup.conf
 echo "Done"
 if [ "$RES_CRED" != "Failed." ]
 then
-  echo -e "${RES_CRED}"
+    # TODO: replace echo -e bashism.
-  exit 0
+    echo -e "${RES_CRED}"
+    exit 0
 else
-  echo "FAIL: Failed to verify credential $RES_CRED."
+    echo "FAIL: Failed to verify credential $RES_CRED."
-  exit 1
+    exit 1
 fi
diff --git a/src/credential/test_credential_issue.sh b/src/credential/test_credential_issue.sh
index 158d91c5b..f06de5d42 100755
--- a/src/credential/test_credential_issue.sh
+++ b/src/credential/test_credential_issue.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
@@ -20,7 +20,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f`
 #  (3) PKEY3.user -> PKEY4
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 TEST_ATTR="test"
 gnunet-arm -s -c test_credential_lookup.conf
diff --git a/src/credential/test_credential_issue_rest.sh b/src/credential/test_credential_issue_rest.sh
index 15cd55083..c518c08ec 100755
--- a/src/credential/test_credential_issue_rest.sh
+++ b/src/credential/test_credential_issue_rest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
@@ -20,7 +20,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f`
 #  (3) PKEY3.user -> PKEY4
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 TEST_ATTR="test"
 gnunet-arm -s -c test_credential_lookup.conf
diff --git a/src/credential/test_credential_verify.sh b/src/credential/test_credential_verify.sh
index d042bcfe6..49d4d4afb 100755
--- a/src/credential/test_credential_verify.sh
+++ b/src/credential/test_credential_verify.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
@@ -22,7 +22,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f`
 #  (5) GNUnet.developer -> Alice
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 gnunet-arm -s -c test_credential_lookup.conf
 gnunet-identity -C service -c test_credential_lookup.conf
 gnunet-identity -C alice -c test_credential_lookup.conf
@@ -73,6 +73,7 @@ gnunet-arm -e -c test_credential_lookup.conf
 if [ "$RES_CRED" != "Failed." ]
 then
+  # TODO: replace echo -e bashism
  echo -e "${RES_CRED}"
  exit 0
 else
diff --git a/src/credential/test_credential_verify_and.sh b/src/credential/test_credential_verify_and.sh
index 9d5c1962e..7e8dc1392 100755
--- a/src/credential/test_credential_verify_and.sh
+++ b/src/credential/test_credential_verify_and.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
@@ -22,7 +22,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f`
 #  (5) GNUnet.developer -> Alice
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 gnunet-arm -s -c test_credential_lookup.conf
 gnunet-identity -C service -c test_credential_lookup.conf
 gnunet-identity -C alice -c test_credential_lookup.conf
@@ -73,6 +73,7 @@ gnunet-arm -e -c test_credential_lookup.conf
 if [ "$RES_CRED" != "Failed." ]
 then
+  # TODO: echo -e bashism
  echo -e "${RES_CRED}"
  exit 0
 else
diff --git a/src/credential/test_credential_verify_rest.sh b/src/credential/test_credential_verify_rest.sh
index 6133ea25e..99db5da8a 100755
--- a/src/credential/test_credential_verify_rest.sh
+++ b/src/credential/test_credential_verify_rest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
@@ -22,7 +22,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f`
 #  (5) GNUnet.developer -> Alice
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 gnunet-arm -s -c test_credential_lookup.conf
 gnunet-identity -C service -c test_credential_lookup.conf
 gnunet-identity -C alice -c test_credential_lookup.conf
@@ -79,6 +79,7 @@ gnunet-arm -e -c test_credential_lookup.conf
 if [ "$RES_CRED" != "Failed." ]
 then
+  # TODO: replace echo -e bashism
  echo -e "${RES_CRED}"
  exit 0
 else
diff --git a/src/credential/test_credential_verify_simple.sh b/src/credential/test_credential_verify_simple.sh
index bcb3f9877..41afb47b0 100755
--- a/src/credential/test_credential_verify_simple.sh
+++ b/src/credential/test_credential_verify_simple.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
@@ -18,7 +18,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f`
 #  (3) Isser.user -> Subject
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 gnunet-arm -s -c test_credential_lookup.conf
 gnunet-identity -C testissuer -c test_credential_lookup.conf
 gnunet-identity -C testsubject -c test_credential_lookup.conf
diff --git a/src/dht/test_dht_tools.py.in b/src/dht/test_dht_tools.py.in
index 38a9f9622..2d9379a42 100644
--- a/src/dht/test_dht_tools.py.in
+++ b/src/dht/test_dht_tools.py.in
@@ -11,8 +11,7 @@
 #
 # The code does NOT depend on DHT routing or any actual P2P functionality.
 #
-from __future__ import print_function
-from __future__ import absolute_import
 import os
 import sys
 import shutil
diff --git a/src/dns/gnunet-helper-dns.c b/src/dns/gnunet-helper-dns.c
index f236924bb..fb970224a 100644
--- a/src/dns/gnunet-helper-dns.c
+++ b/src/dns/gnunet-helper-dns.c
@@ -83,7 +83,7 @@
 */
 #define MAX_SIZE 65536
-#ifndef _LINUX_IN6_H
+#if !HAVE_DECL_STRUCT_IN6_IFREQ
 /**
 * This is in linux/include/net/ipv6.h, but not always exported...
 */
diff --git a/src/dns/test_gnunet_dns.sh b/src/dns/test_gnunet_dns.sh
index 57b9716f5..0fa338c9b 100755
--- a/src/dns/test_gnunet_dns.sh
+++ b/src/dns/test_gnunet_dns.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 ME=`whoami`
 if [ "$ME" != "root" ]
@@ -26,12 +26,17 @@ then
  echo "This test requires nslookup.  Skipping."
  exit 77
 fi
-if ! iptables -t mangle --list &> /dev/null
+if [ ! -x `which iptables` ]
+then
+    echo "This test requires iptables.  Skipping."
+    exit 77
+fi
+if ! iptables -t mangle --list > /dev/null 2>&1
 then
  echo "This test requires iptables with 'mangle' support. Skipping."
  exit 77
 fi
-if grep % /etc/resolv.conf &> /dev/null
+if grep % /etc/resolv.conf > /dev/null 2>&1
 then
  echo "This system seems to use a DNS server on an IPv6 link-local address, which is not supported. Skipping."
  exit 77
@@ -52,5 +57,6 @@ else
 echo "Test run, with success."
 ret=0
 fi
+# TODO: jobs is a possible bashism. Fix.
 kill `jobs -p`
 exit $ret
diff --git a/src/exit/install-exit-helper.sh b/src/exit/install-exit-helper.sh
index 76af4efa7..d9ae14106 100755
--- a/src/exit/install-exit-helper.sh
+++ b/src/exit/install-exit-helper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # $1 - bindir
 # $2 - sudo binary (optional)
 $2 chown root:root $1/gnunet-helper-exit || true
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index eb8a7ed19..fbf32c2a7 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -122,7 +122,7 @@ static int extract_only;
 /**
 * Command-line option to disable adding creation time.
 */
-static int do_disable_creation_time;
+static int enable_creation_time;
 /**
 * Handle to the directory scanner (for recursive insertions).
@@ -419,7 +419,7 @@ publish_inspector (void *cls,
    GNUNET_CONTAINER_meta_data_destroy (meta);
    meta = NULL;
  }
-  if (!do_disable_creation_time)
+  if (enable_creation_time)
    GNUNET_CONTAINER_meta_data_add_publication_date (m);
  if (extract_only)
  {
@@ -902,15 +902,15 @@ main (int argc,
                               "LEVEL",
                               gettext_noop ("set the desired LEVEL of sender-anonymity"),
                               &bo.anonymity_level),
-    GNUNET_GETOPT_option_flag ('d',
-                               "disable-creation-time",
-                               gettext_noop ("disable adding the creation time to the "
-                                             "metadata of the uploaded file"),
-                               &do_disable_creation_time),
    GNUNET_GETOPT_option_flag ('D',
                               "disable-extractor",
                               gettext_noop ("do not use libextractor to add keywords or metadata"),
                               &disable_extractor),
+    GNUNET_GETOPT_option_flag ('E',
+                               "enable-creation-time",
+                               gettext_noop ("enable adding the creation time to the "
+                                             "metadata of the uploaded file"),
+                               &enable_creation_time),
    GNUNET_GETOPT_option_flag ('e',
                               "extract",
                               gettext_noop ("print list of extracted keywords that would "
diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in
index d5a036c28..a1e4db9d5 100755
--- a/src/fs/test_gnunet_fs_psd.py.in
+++ b/src/fs/test_gnunet_fs_psd.py.in
@@ -18,7 +18,7 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 # Testcase for file-sharing command-line tools (publish, search, download)
-from __future__ import print_function
 import sys
 import os
 import subprocess
diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in
index 59063a9ee..0f881564f 100755
--- a/src/fs/test_gnunet_fs_rec.py.in
+++ b/src/fs/test_gnunet_fs_rec.py.in
@@ -11,7 +11,7 @@
 #    WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #    Affero General Public License for more details.
-#   
+#
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
@@ -65,7 +65,7 @@ tar.extractall()
 # first, basic publish-search-download run
 try:
    pub = pexpect()
-    pub.spawn(None, [publish, '-c', 'test_gnunet_fs_rec_data.conf', '-d', '-k', 'testdir', 'dir/'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    pub.spawn(None, [publish, '-c', 'test_gnunet_fs_rec_data.conf', '-k', 'testdir', 'dir/'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
    # Can't say much for publishing, except that the last one is the toplevel directory
    pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
    pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 434d50f34..6ebbbcaff 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -89,9 +89,16 @@ bin_PROGRAMS += gnunet-bcd
 endif
 endif
+if HAVE_MHD
+if HAVE_JSON
+REST_PLUGIN = libgnunet_plugin_rest_gns.la
+endif
+endif
 plugin_LTLIBRARIES = \
  libgnunet_plugin_block_gns.la \
-  libgnunet_plugin_gnsrecord_gns.la
+  libgnunet_plugin_gnsrecord_gns.la \
+  $(REST_PLUGIN)
 bin_SCRIPTS = \
@@ -104,6 +111,21 @@ gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile
        $(do_subst) < $(srcdir)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca
        chmod +x gnunet-gns-proxy-setup-ca
+libgnunet_plugin_rest_gns_la_SOURCES = \
+  plugin_rest_gns.c
+libgnunet_plugin_rest_gns_la_LIBADD = \
+  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
+  libgnunetgns.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_gns_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_gnsrecord_gns_la_SOURCES = \
  plugin_gnsrecord_gns.c
 libgnunet_plugin_gnsrecord_gns_la_LIBADD = \
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index 2e6a02b07..3252e4888 100644
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -32,6 +32,8 @@ INTERCEPT_DNS = NO
 BINARY = gnunet-gns-proxy
 START_ON_DEMAND = NO
 RUN_PER_USER = YES
+BIND_TO=127.0.0.1
+BIND_TO6=::1
 # Where is the certificate for the GNS proxy stored?
 PROXY_CACERT = $GNUNET_DATA_HOME/gns/gns_ca_cert.pem
@@ -42,6 +44,8 @@ PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
 BINARY = gnunet-dns2gns
 START_ON_DEMAND = NO
 RUN_PER_USER = YES
+BIND_TO=127.0.0.1
+BIND_TO6=::1
 # -d: DNS resolver to use, -s: suffix to use, -f: fcfs suffix to use
 OPTIONS = -d 8.8.8.8
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index 68d090579..d2eabf02c 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -92,6 +92,17 @@ struct Request
  uint16_t original_request_id;
 };
+/**
+ * The address to bind to
+ */
+static in_addr_t address;
+/**
+ * The IPv6 address to bind to
+ */
+static struct in6_addr address6;
 /**
 * Handle to GNS resolver.
@@ -578,6 +589,7 @@ run (void *cls,
     const char *cfgfile,
     const struct GNUNET_CONFIGURATION_Handle *c)
 {
+  char *addr_str;
  (void) cls;
  (void) args;
  (void) cfgfile;
@@ -602,6 +614,52 @@ run (void *cls,
    gns = NULL;
    return;
  }
+  /* Get address to bind to */
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (c, "dns2gns",
+                                                          "BIND_TO",
+                                                          &addr_str))
+  {
+    //No address specified
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Don't know what to bind to...\n");
+    GNUNET_free (addr_str);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  if (1 != inet_pton (AF_INET, addr_str, &address))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unable to parse address %s\n",
+                addr_str);
+    GNUNET_free (addr_str);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  GNUNET_free (addr_str);
+  /* Get address to bind to */
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (c, "dns2gns",
+                                                          "BIND_TO6",
+                                                          &addr_str))
+  {
+    //No address specified
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Don't know what to bind6 to...\n");
+    GNUNET_free (addr_str);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  if (1 != inet_pton (AF_INET6, addr_str, &address6))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unable to parse IPv6 address %s\n",
+                addr_str);
+    GNUNET_free (addr_str);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  GNUNET_free (addr_str);
  listen_socket4 = GNUNET_NETWORK_socket_create (PF_INET,
                                                 SOCK_DGRAM,
                                                 IPPROTO_UDP);
@@ -611,6 +669,7 @@ run (void *cls,
    memset (&v4, 0, sizeof (v4));
    v4.sin_family = AF_INET;
+    v4.sin_addr.s_addr = address;
 #if HAVE_SOCKADDR_IN_SIN_LEN
    v4.sin_len = sizeof (v4);
 #endif
@@ -634,6 +693,7 @@ run (void *cls,
    memset (&v6, 0, sizeof (v6));
    v6.sin6_family = AF_INET6;
+    v6.sin6_addr = address6;
 #if HAVE_SOCKADDR_IN_SIN_LEN
    v6.sin6_len = sizeof (v6);
 #endif
diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in b/src/gns/gnunet-gns-proxy-setup-ca.in
index 0a6fab18a..184da4853 100644
--- a/src/gns/gnunet-gns-proxy-setup-ca.in
+++ b/src/gns/gnunet-gns-proxy-setup-ca.in
@@ -1,78 +1,252 @@
 #!/bin/sh
-# This shell script will generate an X509 certificate for your gnunet-gns-proxy
-# and install it (for both GNUnet and your browser).
 #
+# This shell script will generate an X509 certificate for
+# your gnunet-gns-proxy and install it (for both GNUnet
+# and your browser).
+#
+# TODO: Implement support for more browsers
+# TODO: Debug and switch to the new version
+# TODO  - The only remaining task is fixing the getopts
+# TODO: Error checks
+#
+# The current version partially reuses and recycles
+# code from build.sh by NetBSD (although not entirely
+# used because it needs debugging):
+#
+# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to
+# The NetBSD Foundation by Todd Vierling and Luke Mewburn.
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+# 1. Redistributions of source code must retain the above
+#    copyright notice, this list of conditions and the following
+#    disclaimer.
+# 2. Redistributions in binary form must reproduce the above
+#    copyright notice, this list of conditions and the following
+#    disclaimer in the documentation and/or other materials
+#    provided with the distribution.
-OPENSSLCFG=@pkgdatadir@/openssl.cnf
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-if ! which openssl > /dev/null
+# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-then
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    echo "'openssl' command not found. Please install it."
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    exit 1
+# DISCLAIMED.
-fi
+# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-echo "Generating CA"
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-options=''
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-while getopts "c:" opt; do
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  case $opt in
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    c)
+# LIABILITY, OR TORT
-      options="$options -c $OPTARG"
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-      ;;
+# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-    \?)
+# OF SUCH DAMAGE.
-      echo "Invalid option: -$OPTARG" >&2
-      exit 1
+progname=${0##*/}
-      ;;
-    :)
+setdefaults()
-      echo "Option -$OPTARG requires an argument." >&2
+{
-      exit 1
+    verbosity=0
-      ;;
+    runcmd=
-  esac
+}
-done
+statusmsg()
-GNSCERT=`mktemp /tmp/gnscertXXXXXX.pem`
+{
-GNSCAKY=`mktemp /tmp/gnscakeyXXXXXX.pem`
+    ${runcmd} echo "    $@"
-GNSCANO=`mktemp /tmp/gnscakeynoencXXXXXX.pem`
+}
-GNS_CA_CERT_PEM=`gnunet-config -s gns-proxy -o PROXY_CACERT -f $options`
-mkdir -p `dirname $GNS_CA_CERT_PEM`
+infomsg()
+{
-openssl req -config $OPENSSLCFG -new -x509 -days 3650 -extensions v3_ca -keyout $GNSCAKY -out $GNSCERT -subj "/C=ZZ/L=World/O=GNU/OU=GNUnet/CN=GNS Proxy CA/emailAddress=bounce@gnunet.org" -passout pass:"GNU Name System"
+    if [ $verbosity = 1 ]; then
+        statusmsg "INFO: $@"
-echo "Removing passphrase from key"
-openssl rsa -passin pass:"GNU Name System" -in $GNSCAKY -out $GNSCANO
-echo "Making private key available to gnunet-gns-proxy"
-cat $GNSCERT $GNSCANO > $GNS_CA_CERT_PEM
-if ! which certutil > /dev/null
-then
-  echo "The 'certutil' command was not found. Not importing into browsers."
-  echo "For 'certutil' install nss."
-else
-  echo "Importing CA into browsers"
-  for f in ~/.mozilla/firefox/*.*/
-  do
-    if [ -d $f ]; then
-      echo "Importing CA info Firefox at $f"
-      # delete old certificate (if any)
-      certutil -D -n "GNS Proxy CA" -d "$f" >/dev/null 2>/dev/null
-      # add new certificate
-      certutil -A -n "GNS Proxy CA" -t CT,, -d "$f" < $GNSCERT
    fi
-  done
+}
-  if [ -d ~/.pki/nssdb/ ]; then
+warningmsg()
-    echo "Importing CA into Chrome at ~/.pki/nssdb/"
+{
-    # delete old certificate (if any)
+    statusmsg "WARNING: $@"
-    certutil -D -n "GNS Proxy CA" -d ~/.pki/nssdb/ >/dev/null 2>/dev/null
+}
-    # add new certificate
-    certutil -A -n "GNS Proxy CA" -t CT,, -d ~/.pki/nssdb/ < $GNSCERT
+errormsg()
-  fi
+{
-fi
+    statusmsg "ERROR: $@"
+}
-echo "Cleaning up."
-rm -f $GNSCAKY $GNSCANO $GNSCERT
+linemsg()
+{
-echo "==================================="
+    statusmsg "========================================="
-echo "You can now start gnunet-gns-proxy."
+}
-echo "Afterwards, configure your browser "
-echo " to use a SOCKS proxy on port 7777."
-echo "==================================="
+usage()
+{
+    if [ -n "$*" ]; then
+        echo ""
+        echo "${progname}: $*"
+    fi
+    cat <<_usage_
+Usage: ${progname} [-hv] [-c FILE] [...]
+Options:
+   -c FILE      Use the configuration file FILE.
+   -h           Print this help message.
+   -v           Print the version and exit.
+   -V           be verbose
+_usage_
+        exit 1
+}
+generate_ca()
+{
+    echo ""
+    infomsg "Generating CA"
+    TMPDIR=${TMPDIR:-/tmp}
+    if [ -e "$TMPDIR" ]; then
+        GNSCERT=`mktemp -t certXXXXXXXX.pem` || exit 1
+        GNSCAKY=`mktemp -t cakyXXXXXXXX.pem` || exit 1
+        GNSCANO=`mktemp -t canoXXXXXXXX.pem` || exit 1
+    else
+        # This warning is mostly pointless.
+        warning "You need to export the TMPDIR variable"
+    fi
+    # # ------------- gnutls
+    #
+    # if ! which certutil > /dev/null
+    # then
+    #     warningmsg "The 'certutil' command was not found."
+    #     warningmsg "Not importing into browsers."
+    #     warningmsg "For 'certutil' install nss."
+    # else
+    #     # Generate CA key
+    #     # pkcs#8 password-protects key
+    #     certtool --pkcs8 --generate-privkey --sec-param high --outfile ca-key.pem
+    #     # self-sign the CA to create public certificate
+    #     certtool --generate-self-signed --load-privkey ca-key.pem --template ca.cfg --outfile ca.pem
+    # ------------- openssl
+    OPENSSLCFG=@pkgdatadir@/openssl.cnf
+    if test -z "`openssl version`" > /dev/null
+    then
+        warningmsg "'openssl' command not found. Please install it."
+        infomsg    "Cleaning up."
+        rm -f $GNSCAKY $GNSCANO $GNSCERT
+        exit 1
+    fi
+    if [ -n "${GNUNET_CONFIG_FILE}" ]; then
+        GNUNET_CONFIG="-c ${GNUNET_CONFIG_FILE}"
+    else
+        GNUNET_CONFIG=""
+    fi
+    GNS_CA_CERT_PEM=`gnunet-config ${GNUNET_CONFIG} -s gns-proxy -o PROXY_CACERT -f ${options}`
+    mkdir -p `dirname $GNS_CA_CERT_PEM`
+    openssl req -config $OPENSSLCFG -new -x509 -days 3650 -extensions v3_ca -keyout $GNSCAKY -out $GNSCERT -subj "/C=ZZ/L=World/O=GNU/OU=GNUnet/CN=GNS Proxy CA/emailAddress=bounce@gnunet.org" -passout pass:"GNU Name System"
+    infomsg "Removing passphrase from key"
+    openssl rsa -passin pass:"GNU Name System" -in $GNSCAKY -out $GNSCANO
+    infomsg "Making private key available to gnunet-gns-proxy"
+    cat $GNSCERT $GNSCANO > $GNS_CA_CERT_PEM
+}
+importbrowsers()
+{
+    # Don't check with -H, -H defies any method to not
+    # print the output on screen! Let's hope that every
+    # certutil gets build with some kind of build flags
+    # which end up being printed here:
+    if test -z "`certutil --build-flags`" > /dev/null 2>&1
+    then
+        warningmsg "The 'certutil' command was not found."
+        warningmsg "Not importing into browsers."
+        warningmsg "For 'certutil' install nss."
+    else
+        infomsg "Importing CA into browsers"
+        # TODO: Error handling?
+        for f in ~/.mozilla/firefox/*.*/
+        do
+            if [ -d $f ]; then
+                infomsg "Importing CA into Firefox at $f"
+                # delete old certificate (if any)
+                certutil -D -n "GNS Proxy CA" -d "$f" >/dev/null 2>/dev/null
+                # add new certificate
+                certutil -A -n "GNS Proxy CA" -t CT,, -d "$f" < $GNSCERT
+            fi
+        done
+        # TODO: Error handling?
+        if [ -d ~/.pki/nssdb/ ]; then
+            infomsg "Importing CA into Chrome at ~/.pki/nssdb/"
+            # delete old certificate (if any)
+            certutil -D -n "GNS Proxy CA" -d ~/.pki/nssdb/ >/dev/null 2>/dev/null
+            # add new certificate
+            certutil -A -n "GNS Proxy CA" -t CT,, -d ~/.pki/nssdb/ < $GNSCERT
+        fi
+    fi
+}
+print_version()
+{
+    GNUNET_ARM_VERSION=`gnunet-arm -v`
+    echo $GNUNET_ARM_VERSION
+}
+clean_up()
+{
+    infomsg "Cleaning up."
+    rm -f $GNSCAKY $GNSCANO $GNSCERT
+    if [ -e $SETUP_TMPDIR ]; then
+        rm -rf $SETUP_TMPDIR
+    fi
+    linemsg
+    statusmsg "You can now start gnunet-gns-proxy."
+    statusmsg "Afterwards, configure your browser "
+    statusmsg "to use a SOCKS proxy on port 7777. "
+    linemsg
+}
+main()
+{
+    while getopts "vhVc:" opt; do
+        case $opt in
+            v)
+                print_version
+                exit 0
+                ;;
+            h)
+                usage
+                ;;
+            V)
+                verbosity=1
+                ;;
+            c)
+                options="$options -c $OPTARG"
+                infomsg "Using configuration file $OPTARG"
+                GNUNET_CONFIG_FILE=${OPTARG}
+                ;;
+            \?)
+                echo "Invalid option: -$OPTARG" >&2
+                usage
+                ;;
+            :)
+                echo "Option -$OPTARG requires an argument." >&2
+                usage
+                ;;
+        esac
+    done
+    setdefaults
+    generate_ca
+    importbrowsers
+    clean_up
+}
+main "$@"
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 65a7b6018..bae222499 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -661,6 +661,15 @@ struct Socks5Request
 /* *********************** Globals **************************** */
+/**
+ * The address to bind to
+ */
+static in_addr_t address;
+/**
+ * The IPv6 address to bind to
+ */
+static struct in6_addr address6;
 /**
 * The port the proxy is running on (default 7777)
@@ -2182,7 +2191,7 @@ create_response (void *cls,
    }
    MHD_get_connection_values (con,
                               MHD_HEADER_KIND,
-                               &con_val_iter,
+                               (MHD_KeyValueIterator) &con_val_iter,
                               s5r);
    curl_easy_setopt (s5r->curl,
                      CURLOPT_HTTPHEADER,
@@ -3516,6 +3525,7 @@ bind_v4 ()
  memset (&sa4, 0, sizeof (sa4));
  sa4.sin_family = AF_INET;
  sa4.sin_port = htons (port);
+  sa4.sin_addr.s_addr = address;
 #if HAVE_SOCKADDR_IN_SIN_LEN
  sa4.sin_len = sizeof (sa4);
 #endif
@@ -3553,6 +3563,7 @@ bind_v6 ()
  memset (&sa6, 0, sizeof (sa6));
  sa6.sin6_family = AF_INET6;
  sa6.sin6_port = htons (port);
+  sa6.sin6_addr = address6;
 #if HAVE_SOCKADDR_IN_SIN_LEN
  sa6.sin6_len = sizeof (sa6);
 #endif
@@ -3591,10 +3602,56 @@ run (void *cls,
 {
  char* cafile_cfg = NULL;
  char* cafile;
+  char* addr_str;
  struct MhdHttpList *hd;
  cfg = c;
+  /* Get address to bind to */
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "gns-proxy",
+                                                          "BIND_TO",
+                                                          &addr_str))
+  {
+    //No address specified
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Don't know what to bind to...\n");
+    GNUNET_free (addr_str);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  if (1 != inet_pton (AF_INET, addr_str, &address))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unable to parse address %s\n",
+                addr_str);
+    GNUNET_free (addr_str);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  GNUNET_free (addr_str);
+  /* Get address to bind to */
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "gns-proxy",
+                                                          "BIND_TO6",
+                                                          &addr_str))
+  {
+    //No address specified
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Don't know what to bind6 to...\n");
+    GNUNET_free (addr_str);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  if (1 != inet_pton (AF_INET6, addr_str, &address6))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unable to parse IPv6 address %s\n",
+                addr_str);
+    GNUNET_free (addr_str);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  GNUNET_free (addr_str);
  if (NULL == (curl_multi = curl_multi_init ()))
  {
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/rest-plugins/plugin_rest_gns.c b/src/gns/plugin_rest_gns.c
index e41df4085..e41df4085 100644
--- a/src/rest-plugins/plugin_rest_gns.c
+++ b/src/gns/plugin_rest_gns.c
diff --git a/src/gns/test_gns_at_lookup.sh b/src/gns/test_gns_at_lookup.sh
index d900c070b..bacc63eb0 100755
--- a/src/gns/test_gns_at_lookup.sh
+++ b/src/gns/test_gns_at_lookup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
@@ -14,7 +14,7 @@ then
        exit 77
 fi
-which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 5"
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
 TEST_IP="127.0.0.1"
@@ -31,7 +31,7 @@ gnunet-namestore -z delegatedego -d -n '@' -t A -V $TEST_IP  -e never -c test_gn
 gnunet-arm -e -c test_gns_lookup.conf
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
-if [ "$RES_IP" == "$TEST_IP" ]
+if [ "$RES_IP" = "$TEST_IP" ]
 then
  exit 0
 else
diff --git a/src/gns/test_gns_cname_lookup.sh b/src/gns/test_gns_cname_lookup.sh
index de575c561..d97a4fe5e 100755
--- a/src/gns/test_gns_cname_lookup.sh
+++ b/src/gns/test_gns_cname_lookup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
@@ -16,7 +16,7 @@ fi
 # permissive DNS resolver we will use for the test
 DNS_RESOLVER="8.8.8.8"
-if ! nslookup gnunet.org $DNS_RESOLVER &> /dev/null
+if ! nslookup gnunet.org $DNS_RESOLVER > /dev/null 2>&1
 then
  echo "Cannot reach DNS, skipping test"
  exit 77
@@ -36,7 +36,7 @@ TEST_RECORD_NAME_DNS="www3"
 MY_EGO="myego"
 TEST_DOMAIN_PLUS="www.$MY_EGO"
 TEST_DOMAIN_DNS="www3.$MY_EGO"
-which timeout &> /dev/null && DO_TIMEOUT="timeout 15"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 15"
 gnunet-arm -s -c test_gns_lookup.conf
 gnunet-identity -C $MY_EGO -c test_gns_lookup.conf
@@ -57,7 +57,7 @@ rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
 # make cmp case-insensitive by converting to lower case first
 RES_CNAME_RAW=`echo $RES_CNAME_RAW | tr [A-Z] [a-z]`
 TESTEGOZONE=`echo $TESTEGOZONE | tr [A-Z] [a-z]`
-if [ "$RES_CNAME_RAW" == "server.$TESTEGOZONE" ]
+if [ "$RES_CNAME_RAW" = "server.$TESTEGOZONE" ]
 then
  echo "PASS: CNAME resolution from GNS"
 else
@@ -65,7 +65,7 @@ else
  exit 1
 fi
-if [ "$RES_CNAME" == "$TEST_IP_PLUS" ]
+if [ "$RES_CNAME" = "$TEST_IP_PLUS" ]
 then
  echo "PASS: IP resolution from GNS"
 else
@@ -73,7 +73,7 @@ else
  exit 1
 fi
-if [ "$RES_CNAME_DNS" == "$TEST_IP_DNS" ]
+if [ "$RES_CNAME_DNS" = "$TEST_IP_DNS" ]
 then
  echo "PASS: IP resolution from DNS"
  exit 0
diff --git a/src/gns/test_gns_config_lookup.sh b/src/gns/test_gns_config_lookup.sh
index 35d7c32d9..1c5a62b01 100755
--- a/src/gns/test_gns_config_lookup.sh
+++ b/src/gns/test_gns_config_lookup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
@@ -18,7 +18,7 @@ MY_EGO="myego"
 rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
 CFG=`mktemp  --tmpdir=$PWD`
 cp test_gns_lookup.conf $CFG || exit 77
-which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 5"
 TEST_IP="dead::beef"
 gnunet-arm -s -c $CFG || exit 77
 gnunet-identity -C $MY_EGO -c $CFG 
@@ -35,7 +35,7 @@ gnunet-arm -e -c $CFG
 rm -rf `gnunet-config -c $CFG -f -s paths -o GNUNET_TEST_HOME`
 rm $CFG
-if [ "$RES_IP" == "$TEST_IP" ]
+if [ "$RES_IP" = "$TEST_IP" ]
 then
  exit 0
 else
diff --git a/src/gns/test_gns_delegated_lookup.sh b/src/gns/test_gns_delegated_lookup.sh
index 21774ad8d..af9994b34 100755
--- a/src/gns/test_gns_delegated_lookup.sh
+++ b/src/gns/test_gns_delegated_lookup.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
@@ -35,7 +35,7 @@ gnunet-arm -e -c test_gns_lookup.conf
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
-if [ "$RES_IP" == "$TEST_IP" ]
+if [ "$RES_IP" = "$TEST_IP" ]
 then
  exit 0
 else
diff --git a/src/gns/test_gns_dht_lookup.sh b/src/gns/test_gns_dht_lookup.sh
index 07e559752..ac90d58a8 100755
--- a/src/gns/test_gns_dht_lookup.sh
+++ b/src/gns/test_gns_dht_lookup.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
@@ -55,7 +55,7 @@ then
  echo "Failed to resolve to proper IP, got $RES_IP_REL. (relative expiration)"
  #exit 1
 fi
-if [ "$RES_IP" == "$TEST_IP" ]
+if [ "$RES_IP" = "$TEST_IP" ]
 then
  exit 0
 else
diff --git a/src/gns/test_gns_gns2dns_cname_lookup.sh b/src/gns/test_gns_gns2dns_cname_lookup.sh
index c07905d83..fbc1dd7ee 100755
--- a/src/gns/test_gns_gns2dns_cname_lookup.sh
+++ b/src/gns/test_gns_gns2dns_cname_lookup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
@@ -25,7 +25,7 @@ TEST_RECORD_NAME="homepage"
 XNS=ns.joker.com
-if ! nslookup gnunet.org a.$XNS &> /dev/null
+if ! nslookup gnunet.org a.$XNS > /dev/null 2>&1
 then
  echo "Cannot reach DNS, skipping test"
  exit 77
@@ -43,7 +43,7 @@ MY_EGO="myego"
 # various names we will use for resolution
 TEST_DOMAIN="www.${TEST_RECORD_NAME}.$MY_EGO"
-which timeout &> /dev/null && DO_TIMEOUT="timeout 15"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 15"
 gnunet-arm -s -c test_gns_lookup.conf
 OUT=`$DO_TIMEOUT gnunet-resolver -c test_gns_lookup.conf gnunet.org`
@@ -77,7 +77,7 @@ gnunet-arm -e -c test_gns_lookup.conf
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
 ret=0
-if [ "$RES_IP" == "$TEST_IP" ]
+if [ "$RES_IP" = "$TEST_IP" ]
 then
  echo "PASS: Resolved $TEST_DOMAIN to $RES_IP."
 else
@@ -85,7 +85,7 @@ else
  ret=1
 fi
-if [ "$RES_IP6" == "$TEST_IP6" ]
+if [ "$RES_IP6" = "$TEST_IP6" ]
 then
  echo "PASS: Resolved $TEST_DOMAIN to $RES_IP6."
 else
diff --git a/src/gns/test_gns_gns2dns_lookup.sh b/src/gns/test_gns_gns2dns_lookup.sh
index 24fb36b9d..22caa68ff 100755
--- a/src/gns/test_gns_gns2dns_lookup.sh
+++ b/src/gns/test_gns_gns2dns_lookup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
@@ -26,7 +26,7 @@ TEST_IP_GNS2DNS="8.8.8.8"
 # main label used during resolution
 TEST_RECORD_NAME="homepage"
-if ! nslookup gnunet.org $TEST_IP_GNS2DNS &> /dev/null
+if ! nslookup gnunet.org $TEST_IP_GNS2DNS > /dev/null 2>&1
 then
  echo "Cannot reach DNS, skipping test"
  exit 77
@@ -44,7 +44,7 @@ TEST_DOMAIN="www.${TEST_RECORD_NAME}.$MY_EGO"
 TEST_DOMAIN_ALT="${TEST_RECORD_NAME}.$MY_EGO"
 TEST_DOMAIN_ALT2="docs.${TEST_RECORD_NAME}.$MY_EGO"
-which timeout &> /dev/null && DO_TIMEOUT="timeout 15"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 15"
 gnunet-arm -s -c test_gns_lookup.conf
@@ -83,7 +83,7 @@ gnunet-arm -e -c test_gns_lookup.conf
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
 ret=0
-if [ "$RES_IP" == "$TEST_IP" ]
+if [ "$RES_IP" = "$TEST_IP" ]
 then
  echo "PASS: Resolved $TEST_DOMAIN to $RES_IP."
 else
@@ -91,7 +91,7 @@ else
  ret=1
 fi
-if [ "$RES_IP6" == "$TEST_IP6" ]
+if [ "$RES_IP6" = "$TEST_IP6" ]
 then
  echo "PASS: Resolved $TEST_DOMAIN to $RES_IP6."
 else
@@ -99,7 +99,7 @@ else
  ret=1
 fi
-if [ "$RES_IP_ALT" == "$TEST_IP" ]
+if [ "$RES_IP_ALT" = "$TEST_IP" ]
 then
  echo "PASS: Resolved $TEST_DOMAIN_ALT to $RES_IP_ALT."
 else
@@ -107,7 +107,7 @@ else
  ret=1
 fi
-if [ "$RES_IP_ALT2" == "$TEST_IP_ALT2" ]
+if [ "$RES_IP_ALT2" = "$TEST_IP_ALT2" ]
 then
  echo "PASS: Resolved $TEST_DOMAIN_ALT2 to $RES_IP_ALT2."
 else
diff --git a/src/gns/test_gns_ipv6_lookup.sh b/src/gns/test_gns_ipv6_lookup.sh
index 72da5ee2c..5dbb34a2c 100755
--- a/src/gns/test_gns_ipv6_lookup.sh
+++ b/src/gns/test_gns_ipv6_lookup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
@@ -16,7 +16,7 @@ fi
 MY_EGO="myego"
 rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 TEST_IP="dead::beef"
 gnunet-arm -s -c test_gns_lookup.conf
 gnunet-identity -C $MY_EGO -c test_gns_lookup.conf
@@ -27,7 +27,7 @@ gnunet-identity -D $MY_EGO -c test_gns_lookup.conf
 gnunet-arm -e -c test_gns_lookup.conf
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
-if [ "$RES_IP" == "$TEST_IP" ]
+if [ "$RES_IP" = "$TEST_IP" ]
 then
  exit 0
 else
diff --git a/src/gns/test_gns_lookup.sh b/src/gns/test_gns_lookup.sh
index 2dffa1251..4bd6ae879 100755
--- a/src/gns/test_gns_lookup.sh
+++ b/src/gns/test_gns_lookup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
@@ -15,7 +15,7 @@ then
 fi
 rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 TEST_IP="127.0.0.1"
 MY_EGO="myego"
 LABEL="www"
@@ -27,7 +27,7 @@ gnunet-namestore -z $MY_EGO -d -n $LABEL -t A -V $TEST_IP -e never -c test_gns_l
 gnunet-identity -D $MY_EGO -c test_gns_lookup.conf
 gnunet-arm -e -c test_gns_lookup.conf
-if [ "$RES_IP" == "$TEST_IP" ]
+if [ "$RES_IP" = "$TEST_IP" ]
 then
  exit 0
 else
diff --git a/src/gns/test_gns_mx_lookup.sh b/src/gns/test_gns_mx_lookup.sh
index 79ac37b0a..4e9d98358 100755
--- a/src/gns/test_gns_mx_lookup.sh
+++ b/src/gns/test_gns_mx_lookup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
@@ -15,7 +15,7 @@ then
 fi
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
-which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 5"
 MY_EGO="myego"
 TEST_MX="5,mail.+"
@@ -35,7 +35,7 @@ rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
 RES_MX=`echo $RES_MX | tr [A-Z] [a-z]`
 WANT_MX=`echo $WANT_MX | tr [A-Z] [a-z]`
-if [ "$RES_MX" == "$WANT_MX" ]
+if [ "$RES_MX" = "$WANT_MX" ]
 then
  exit 0
 else
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c
index 75fe95617..2a7f8104b 100644
--- a/src/gns/test_gns_proxy.c
+++ b/src/gns/test_gns_proxy.c
@@ -11,7 +11,7 @@
     WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Affero General Public License for more details.
-    
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -50,9 +50,9 @@ static int global_ret;
 static struct MHD_Daemon *mhd;
-static struct GNUNET_SCHEDULER_Task * mhd_task_id;
+static struct GNUNET_SCHEDULER_Task *mhd_task_id;
-static struct GNUNET_SCHEDULER_Task * curl_task_id;
+static struct GNUNET_SCHEDULER_Task *curl_task_id;
 static CURL *curl;
@@ -349,6 +349,7 @@ curl_main ()
 static void
 start_curl (void *cls)
 {
+  curl_task_id = NULL;
  GNUNET_asprintf (&url,
                   "https://%s:%d/hello_world",
                   TEST_DOMAIN, port);
@@ -369,7 +370,9 @@ start_curl (void *cls)
  multi = curl_multi_init ();
  GNUNET_assert (multi != NULL);
  GNUNET_assert (CURLM_OK == curl_multi_add_handle (multi, curl));
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Beginning HTTP download from `%s'\n", url);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Beginning HTTP download from `%s'\n",
+              url);
  curl_main ();
 }
@@ -391,7 +394,8 @@ commence_testing (void *cls)
 {
  curl_task_id =
    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                  &start_curl, NULL);
+                                  &start_curl,
+                                  NULL);
 }
@@ -561,4 +565,4 @@ main (int argc, char *const *argv)
  return global_ret;
 }
-/* end of test_gns_vpn.c */
+/* end of test_gns_proxy.c */
diff --git a/src/gns/test_gns_quickupdate.sh b/src/gns/test_gns_quickupdate.sh
index d9807fe22..d2b4bf2cb 100755
--- a/src/gns/test_gns_quickupdate.sh
+++ b/src/gns/test_gns_quickupdate.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
@@ -19,7 +19,7 @@ OTHER_EGO="delegatedego"
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
-which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 5"
 TEST_IP="127.0.0.1"
 gnunet-arm -s -c test_gns_lookup.conf
 gnunet-identity -C $MY_EGO -c test_gns_lookup.conf
@@ -56,7 +56,7 @@ gnunet-identity -D $OTHER_EGO -c test_gns_lookup.conf
 gnunet-arm -e -c test_gns_lookup.conf
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
-if [ "$RES_IP" == "$TEST_IP" ]
+if [ "$RES_IP" = "$TEST_IP" ]
 then
  exit 0
 else
diff --git a/src/gns/test_gns_rel_expiration.sh b/src/gns/test_gns_rel_expiration.sh
index c7c66bc27..993c2131e 100755
--- a/src/gns/test_gns_rel_expiration.sh
+++ b/src/gns/test_gns_rel_expiration.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
@@ -25,7 +25,7 @@ MY_EGO="myego"
 OTHER_EGO="delegatedego"
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
-which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 5"
 TEST_IP="127.0.0.1"
 gnunet-arm -s -c test_gns_lookup.conf
 gnunet-identity -C $MY_EGO -c test_gns_lookup.conf
@@ -48,13 +48,13 @@ gnunet-identity -D $OTHER_EGO -c test_gns_lookup.conf
 gnunet-arm -e -c test_gns_lookup.conf
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
-if [ "$RES_IP_EXP" == "$TEST_IP" ]
+if [ "$RES_IP_EXP" = "$TEST_IP" ]
 then
  echo "Failed to properly expire IP, got $RES_IP_EXP."
  exit 1
 fi
-if [ "$RES_IP" == "$TEST_IP" ]
+if [ "$RES_IP" = "$TEST_IP" ]
 then
  exit 0
 else
diff --git a/src/gns/test_gns_revocation.sh b/src/gns/test_gns_revocation.sh
index 08a0f8ac1..3c0cf02fb 100755
--- a/src/gns/test_gns_revocation.sh
+++ b/src/gns/test_gns_revocation.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 5"
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
@@ -40,7 +40,7 @@ then
  exit 1
 fi
-if [ "x$RES_IP_REV" == "x" ]
+if [ "x$RES_IP_REV" = "x" ]
 then
  exit 0
 else
diff --git a/src/gns/test_gns_soa_lookup.sh b/src/gns/test_gns_soa_lookup.sh
index 6a09ac8c7..c5b049b72 100755
--- a/src/gns/test_gns_soa_lookup.sh
+++ b/src/gns/test_gns_soa_lookup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
@@ -14,7 +14,7 @@ then
        exit 77
 fi
-which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 5"
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
 MY_EGO="myego"
@@ -24,7 +24,7 @@ TEST_IP_GNS2DNS="184.172.157.218"
 TEST_RECORD_NAME="homepage"
 TEST_RECORD_GNS2DNS="gnunet.org"
-if ! nslookup $TEST_RECORD_GNS2DNS $TEST_IP_GNS2DNS &> /dev/null
+if ! nslookup $TEST_RECORD_GNS2DNS $TEST_IP_GNS2DNS > /dev/null 2>&1
 then
  echo "Cannot reach DNS, skipping test"
  exit 77
@@ -34,7 +34,7 @@ gnunet-arm -s -c test_gns_lookup.conf
 gnunet-identity -C $MY_EGO -c test_gns_lookup.conf
 gnunet-namestore -p -z $MY_EGO -a -n $TEST_RECORD_NAME -t GNS2DNS -V ${TEST_RECORD_GNS2DNS}@${TEST_IP_GNS2DNS} -e never -c test_gns_lookup.conf
 RES_SOA=`$DO_TIMEOUT gnunet-gns --raw -u $TEST_DOMAIN -t SOA -c test_gns_lookup.conf`
-gnunet-namestore -z $MY_EGO -d -n $TEST_RECORD_NAME -t GNS2DNS -V ${TEST_RECORD_GNS2DNS}@${TEST_IP_GNS2DNS} -e never -c test_gns_lookup.conf &> /dev/null
+gnunet-namestore -z $MY_EGO -d -n $TEST_RECORD_NAME -t GNS2DNS -V ${TEST_RECORD_GNS2DNS}@${TEST_IP_GNS2DNS} -e never -c test_gns_lookup.conf > /dev/null 2>&1
 gnunet-identity -D $MY_EGO -c test_gns_lookup.conf
 gnunet-arm -e -c test_gns_lookup.conf
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
diff --git a/src/gns/test_gns_txt_lookup.sh b/src/gns/test_gns_txt_lookup.sh
index 6c6b4b3f6..b0c9144c2 100755
--- a/src/gns/test_gns_txt_lookup.sh
+++ b/src/gns/test_gns_txt_lookup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
@@ -15,7 +15,7 @@ then
 fi
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 TEST_TXT="GNS powered txt record data"
 MY_EGO="myego"
 LABEL="testtxt"
@@ -28,7 +28,7 @@ gnunet-identity -D $MY_EGO -c test_gns_lookup.conf
 gnunet-arm -e -c test_gns_lookup.conf
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
-if [ "$RES_TXT" == "$TEST_TXT" ]
+if [ "$RES_TXT" = "$TEST_TXT" ]
 then
  exit 0
 else
diff --git a/src/gns/test_gns_zkey_lookup.sh b/src/gns/test_gns_zkey_lookup.sh
index b36a16fa2..03118d741 100755
--- a/src/gns/test_gns_zkey_lookup.sh
+++ b/src/gns/test_gns_zkey_lookup.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 5"
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
@@ -30,7 +30,7 @@ gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP  -e never -c test_gn
 gnunet-arm -e -c test_gns_lookup.conf
 rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
-if [ "$RES_IP" == "$TEST_IP" ]
+if [ "$RES_IP" = "$TEST_IP" ]
 then
  exit 0
 else
diff --git a/src/gns/test_gnunet_gns.sh b/src/gns/test_gnunet_gns.sh
index f6b4e721a..74c49c537 100755
--- a/src/gns/test_gnunet_gns.sh
+++ b/src/gns/test_gnunet_gns.sh
@@ -1,15 +1,25 @@
-#!/bin/bash
+#!/bin/sh
 # This file is in the public domain.
-LOCATION=$(which gnunet-config)
+# test -z being correct was a false assumption here.
-if [ -z $LOCATION ]
+# I have no executable 'fooble', but this will
-then
+# return 1:
-  LOCATION="gnunet-config"
+# if test -z "`which fooble`"; then echo 1; fi
+# The command builtin might not work with busybox's ash
+# but this works for now.
+existence()
+{
+    command -v "$1" >/dev/null 2>&1
+}
+LOCATION=`existence gnunet-config`
+if test -z $LOCATION; then
+    LOCATION="gnunet-config"
 fi
 $LOCATION --version
 if test $? != 0
 then
-        echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
+    echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 77
+    exit 77
 fi
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
@@ -32,4 +42,5 @@ if [ "$LO" != "Address: 4.5.6.7" ]
 then
  echo "Fail: $LO"
 fi
+# XXX: jobs. a builtin by bash, netbsd sh, maybe leave it be for now.
 kill `jobs -p`
diff --git a/src/rest-plugins/test_plugin_rest_gns.sh b/src/gns/test_plugin_rest_gns.sh
index ec495a04b..ec495a04b 100755
--- a/src/rest-plugins/test_plugin_rest_gns.sh
+++ b/src/gns/test_plugin_rest_gns.sh
diff --git a/src/gns/test_proxy.sh b/src/gns/test_proxy.sh
index c960d4df9..7c17cd4c5 100755
--- a/src/gns/test_proxy.sh
+++ b/src/gns/test_proxy.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
+# This file is in the public domain.
 TEST_DOMAIN="www.test"
+# Delete old files before starting test
+rm -rf /tmp/gnunet/test-gnunet-gns-testing/
 gnunet-arm -s -c test_gns_proxy.conf
 gnunet-gns-proxy-setup-ca -c test_gns_proxy.conf
diff --git a/src/hostlist/hostlist.conf b/src/hostlist/hostlist.conf
index 32e5d8320..6b7a6aac7 100644
--- a/src/hostlist/hostlist.conf
+++ b/src/hostlist/hostlist.conf
@@ -20,7 +20,7 @@ HOSTLISTFILE = $GNUNET_CONFIG_HOME/hostlist/learned.txt
 OPTIONS = -b
 # Default list of hostlist servers for bootstrapping
-SERVERS = http://v10.gnunet.org/hostlist https://gnunet.io/hostlist
+SERVERS = http://v11.gnunet.org/hostlist https://gnunet.io/hostlist
 # http://silent.0xdeadc0de.eu:8080/
 # bind hostlist http server to a specific IPv4
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index 1f21fc65d..5c1af8e19 100644
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -12,6 +12,12 @@ if USE_COVERAGE
  XLIB = -lgcov
 endif
+if HAVE_MHD
+if HAVE_JSON
+REST_PLUGIN = libgnunet_plugin_rest_identity.la
+endif
+endif
 pkgcfgdir= $(pkgdatadir)/config.d/
 libexecdir= $(pkglibdir)/libexec/
@@ -20,7 +26,20 @@ pkgcfg_DATA = \
  identity.conf
 lib_LTLIBRARIES = \
-        libgnunetidentity.la
+  libgnunetidentity.la \
+  $(REST_PLUGIN)
+libgnunet_plugin_rest_identity_la_SOURCES = \
+  plugin_rest_identity.c
+libgnunet_plugin_rest_identity_la_LIBADD = \
+  libgnunetidentity.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_identity_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
 libgnunetidentity_la_SOURCES = \
  identity_api.c \
diff --git a/src/rest-plugins/plugin_rest_identity.c b/src/identity/plugin_rest_identity.c
index 3bfca3121..3bfca3121 100644
--- a/src/rest-plugins/plugin_rest_identity.c
+++ b/src/identity/plugin_rest_identity.c
diff --git a/src/rest-plugins/test_plugin_rest_identity.sh b/src/identity/test_plugin_rest_identity.sh
index a5879dd7e..a5879dd7e 100755
--- a/src/rest-plugins/test_plugin_rest_identity.sh
+++ b/src/identity/test_plugin_rest_identity.sh
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 368980064..26dd4f92d 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -20,8 +20,8 @@ check_SCRIPTS = \
  test_integration_disconnect.py \
  test_integration_disconnect_nat.py \
  test_integration_reconnect.py \
-  test_integration_reconnect_nat.py \
+  test_integration_reconnect_nat.py
-  test_integration_clique.py
+#  test_integration_clique.py
 endif
diff --git a/src/integration-tests/gnunet_pyexpect.py.in b/src/integration-tests/gnunet_pyexpect.py.in
index 83acb908f..d757634a5 100644
--- a/src/integration-tests/gnunet_pyexpect.py.in
+++ b/src/integration-tests/gnunet_pyexpect.py.in
@@ -18,8 +18,7 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 # Testcase for gnunet-peerinfo
-from __future__ import print_function
-from builtins import object
 import os
 import re
 import subprocess
diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in
index c9342ecf0..c3596d232 100644
--- a/src/integration-tests/gnunet_testing.py.in
+++ b/src/integration-tests/gnunet_testing.py.in
@@ -18,10 +18,7 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 # Functions for integration testing
-from __future__ import unicode_literals
-from __future__ import print_function
-from builtins import object
-from builtins import str
 import os
 import subprocess
 import sys
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
index f0de1c0cd..4b4b35629 100755
--- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
@@ -18,7 +18,7 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 #
-from __future__ import print_function
 import signal
 import sys
 import os
diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in
index b5d6dd518..0444cf249 100755
--- a/src/integration-tests/test_integration_clique.py.in
+++ b/src/integration-tests/test_integration_clique.py.in
@@ -25,7 +25,6 @@
 # Conditions for successful exit:
 # Both peers have 2 connected peers in transport, core, topology, fs and dht
-from __future__ import print_function
 import sys
 import signal
 import os
diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in
index a81c78540..737014e61 100755
--- a/src/integration-tests/test_integration_disconnect.py.in
+++ b/src/integration-tests/test_integration_disconnect.py.in
@@ -18,7 +18,7 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 #
-from __future__ import print_function
 import sys
 import signal
 import os
diff --git a/src/integration-tests/test_integration_disconnect_nat.py.in b/src/integration-tests/test_integration_disconnect_nat.py.in
index 601586f47..c3d5d8901 100755
--- a/src/integration-tests/test_integration_disconnect_nat.py.in
+++ b/src/integration-tests/test_integration_disconnect_nat.py.in
@@ -18,7 +18,7 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 #
-from __future__ import print_function
 import sys
 import signal
 import os
diff --git a/src/integration-tests/test_integration_reconnect.py.in b/src/integration-tests/test_integration_reconnect.py.in
index e8abacd48..8c4193680 100755
--- a/src/integration-tests/test_integration_reconnect.py.in
+++ b/src/integration-tests/test_integration_reconnect.py.in
@@ -18,7 +18,7 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 #
-from __future__ import print_function
 import sys
 import os
 import subprocess
diff --git a/src/integration-tests/test_integration_reconnect_nat.py.in b/src/integration-tests/test_integration_reconnect_nat.py.in
index 61d2ea966..45626d50d 100755
--- a/src/integration-tests/test_integration_reconnect_nat.py.in
+++ b/src/integration-tests/test_integration_reconnect_nat.py.in
@@ -18,7 +18,7 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 #
-from __future__ import print_function
 import sys
 import os
 import subprocess
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index ac4eebd06..25941b4fb 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -104,10 +104,50 @@ TESTS = \
  $(check_SCRIPTS)
 endif
+if HAVE_MHD
+if HAVE_JSON
+REST_PLUGIN = libgnunet_plugin_rest_namestore.la
+endif
+endif
 lib_LTLIBRARIES = \
  libgnunetnamestore.la
+libexec_PROGRAMS = \
+ gnunet-service-namestore
+bin_PROGRAMS = \
+ gnunet-namestore \
+ gnunet-zoneimport
+if HAVE_MHD
+libexec_PROGRAMS += \
+ gnunet-namestore-fcfsd
+endif
+plugin_LTLIBRARIES = \
+  $(SQLITE_PLUGIN) \
+  $(POSTGRES_PLUGIN) \
+  $(HEAP_PLUGIN) \
+  $(REST_PLUGIN)
+libgnunet_plugin_rest_namestore_la_SOURCES = \
+  plugin_rest_namestore.c
+libgnunet_plugin_rest_namestore_la_LIBADD = \
+  libgnunetnamestore.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_namestore_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
 libgnunetnamestore_la_SOURCES = \
  namestore_api.c \
  namestore_api_monitor.c \
@@ -121,17 +161,6 @@ libgnunetnamestore_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
  -version-info 0:1:0
-libexec_PROGRAMS = \
- gnunet-service-namestore
-bin_PROGRAMS = \
- gnunet-namestore \
- gnunet-zoneimport
-if HAVE_MHD
-libexec_PROGRAMS += \
- gnunet-namestore-fcfsd
-endif
 gnunet_zoneimport_SOURCES = \
@@ -176,12 +205,6 @@ gnunet_service_namestore_LDADD = \
  $(GN_LIBINTL)
-plugin_LTLIBRARIES = \
-  $(SQLITE_PLUGIN) \
-  $(POSTGRES_PLUGIN) \
-  $(HEAP_PLUGIN)
 libgnunet_plugin_namestore_heap_la_SOURCES = \
  plugin_namestore_heap.c
diff --git a/src/rest-plugins/plugin_rest_namestore.c b/src/namestore/plugin_rest_namestore.c
index 26a037eae..26a037eae 100644
--- a/src/rest-plugins/plugin_rest_namestore.c
+++ b/src/namestore/plugin_rest_namestore.c
diff --git a/src/rest-plugins/test_plugin_rest_namestore.sh b/src/namestore/test_plugin_rest_namestore.sh
index 532c7caae..532c7caae 100755
--- a/src/rest-plugins/test_plugin_rest_namestore.sh
+++ b/src/namestore/test_plugin_rest_namestore.sh
diff --git a/src/nat/install-nat-helper.sh b/src/nat/install-nat-helper.sh
index 502aa71f1..d5ee91fa3 100755
--- a/src/nat/install-nat-helper.sh
+++ b/src/nat/install-nat-helper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # $1 - bindir
 # $2 - sudo binary (optional)
 $2 chown root:root $1/gnunet-helper-nat-server $1/gnunet-helper-nat-client || true
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index ef79d6720..3c710eb93 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -5,6 +5,8 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 libexecdir= $(pkglibdir)/libexec/
+plugindir = $(libdir)/gnunet
 pkgcfg_DATA = \
  peerinfo.conf
@@ -17,8 +19,29 @@ if USE_COVERAGE
  XLIB = -lgcov
 endif
+if HAVE_MHD
+if HAVE_JSON
+REST_PLUGIN = libgnunet_plugin_rest_peerinfo.la
+endif
+endif
 lib_LTLIBRARIES = libgnunetpeerinfo.la
+plugin_LTLIBRARIES = $(REST_PLUGIN)
+libgnunet_plugin_rest_peerinfo_la_SOURCES = \
+  plugin_rest_peerinfo.c
+libgnunet_plugin_rest_peerinfo_la_LIBADD = \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  libgnunetpeerinfo.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
 libgnunetpeerinfo_la_SOURCES = \
  peerinfo_api.c peerinfo.h \
  peerinfo_api_notify.c
diff --git a/src/rest-plugins/plugin_rest_peerinfo.c b/src/peerinfo/plugin_rest_peerinfo.c
index 24af2c193..24af2c193 100644
--- a/src/rest-plugins/plugin_rest_peerinfo.c
+++ b/src/peerinfo/plugin_rest_peerinfo.c
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index 05fab18be..069277a00 100644
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -11,7 +11,7 @@
     WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Affero General Public License for more details.
-    
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index 85dd08113..9277aa3c3 100644
--- a/src/pt/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
@@ -7,8 +7,6 @@ PLUGINS = tcp
 [arm]
 PORT = 0
 ALLOW_SHUTDOWN = YES
-START_SYSTEM_SERVICES = NO
-START_USER_SERVICES = NO
 [exit]
 IMMEDIATE_START = YES
diff --git a/src/reclaim/.gitignore b/src/reclaim/.gitignore
index ef77fccdc..46472101b 100644
--- a/src/reclaim/.gitignore
+++ b/src/reclaim/.gitignore
@@ -1,2 +1,2 @@
-gnunet-service-identity-provider
+gnunet-reclaim
-gnunet-identity-token
+gnunet-service-reclaim
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index f9942fa23..13918508e 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -16,6 +16,14 @@ if HAVE_SQLITE
 SQLITE_PLUGIN = libgnunet_plugin_reclaim_sqlite.la
 endif
+if HAVE_MHD
+if HAVE_JSON
+REST_PLUGIN = \
+  libgnunet_plugin_rest_openid_connect.la \
+  libgnunet_plugin_rest_reclaim.la
+endif
+endif
 EXTRA_DIST = \
  reclaim.conf \
  test_reclaim_defaults.conf \
@@ -33,7 +41,8 @@ lib_LTLIBRARIES = \
  libgnunetreclaim.la
 plugin_LTLIBRARIES = \
  libgnunet_plugin_gnsrecord_reclaim.la \
-        $(SQLITE_PLUGIN)
+  $(SQLITE_PLUGIN) \
+  $(REST_PLUGIN)
 bin_PROGRAMS = \
 gnunet-reclaim
@@ -41,6 +50,41 @@ bin_PROGRAMS = \
 libexec_PROGRAMS = \
 gnunet-service-reclaim
+libgnunet_plugin_rest_reclaim_la_SOURCES = \
+  plugin_rest_reclaim.c \
+  json_reclaim.h \
+  json_reclaim.c
+libgnunet_plugin_rest_reclaim_la_LIBADD = \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  libgnunetreclaim.la \
+  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_reclaim_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_rest_openid_connect_la_SOURCES = \
+  plugin_rest_openid_connect.c \
+  oidc_helper.h \
+  oidc_helper.c
+libgnunet_plugin_rest_openid_connect_la_LIBADD = \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  libgnunetreclaim.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+$(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_gnsrecord_reclaim_la_SOURCES = \
  plugin_gnsrecord_reclaim.c
 libgnunet_plugin_gnsrecord_reclaim_la_LIBADD = \
diff --git a/src/rest-plugins/json_reclaim.c b/src/reclaim/json_reclaim.c
index 0fe9150d9..0fe9150d9 100644
--- a/src/rest-plugins/json_reclaim.c
+++ b/src/reclaim/json_reclaim.c
diff --git a/src/rest-plugins/json_reclaim.h b/src/reclaim/json_reclaim.h
index ced2e10dd..ced2e10dd 100644
--- a/src/rest-plugins/json_reclaim.h
+++ b/src/reclaim/json_reclaim.h
diff --git a/src/rest-plugins/oidc_helper.c b/src/reclaim/oidc_helper.c
index 646e58551..646e58551 100644
--- a/src/rest-plugins/oidc_helper.c
+++ b/src/reclaim/oidc_helper.c
diff --git a/src/rest-plugins/oidc_helper.h b/src/reclaim/oidc_helper.h
index d718b7a78..d718b7a78 100644
--- a/src/rest-plugins/oidc_helper.h
+++ b/src/reclaim/oidc_helper.h
diff --git a/src/rest-plugins/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c
index e755f079b..e755f079b 100644
--- a/src/rest-plugins/plugin_rest_openid_connect.c
+++ b/src/reclaim/plugin_rest_openid_connect.c
diff --git a/src/rest-plugins/plugin_rest_reclaim.c b/src/reclaim/plugin_rest_reclaim.c
index b36ed2bb6..b36ed2bb6 100644
--- a/src/rest-plugins/plugin_rest_reclaim.c
+++ b/src/reclaim/plugin_rest_reclaim.c
diff --git a/src/reclaim/test_reclaim.sh b/src/reclaim/test_reclaim.sh
index 311f5382a..da93b10f7 100755
--- a/src/reclaim/test_reclaim.sh
+++ b/src/reclaim/test_reclaim.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #trap "gnunet-arm -e -c test_reclaim_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
@@ -20,7 +20,7 @@ rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f`
 #  (3) PKEY3.user -> PKEY4
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 TEST_ATTR="test"
 gnunet-arm -s -c test_reclaim.conf
diff --git a/src/rest-plugins/Makefile.am b/src/rest-plugins/Makefile.am
deleted file mode 100644
index 006c23101..000000000
--- a/src/rest-plugins/Makefile.am
+++ /dev/null
@@ -1,135 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-plugindir = $(libdir)/gnunet
-pkgcfgdir= $(pkgdatadir)/config.d/
-libexecdir= $(pkglibdir)/libexec/
-if MINGW
-  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
-endif
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_rest_copying.la \
-        libgnunet_plugin_rest_peerinfo.la \
-        libgnunet_plugin_rest_identity.la \
-        libgnunet_plugin_rest_namestore.la \
-  libgnunet_plugin_rest_gns.la 
-if HAVE_ABE
-plugin_LTLIBRARIES += libgnunet_plugin_rest_openid_connect.la \
-                                                                                        libgnunet_plugin_rest_reclaim.la
-endif
-libgnunet_plugin_rest_reclaim_la_SOURCES = \
-  plugin_rest_reclaim.c \
-        json_reclaim.h \
-        json_reclaim.c
-libgnunet_plugin_rest_reclaim_la_LIBADD = \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/reclaim/libgnunetreclaim.la \
-        $(top_builddir)/src/json/libgnunetjson.la \
-  $(top_builddir)/src/rest/libgnunetrest.la \
-  $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_reclaim_la_LDFLAGS = \
- i$(GN_PLUGIN_LDFLAGS)
-#libgnunet_plugin_rest_credential_la_SOURCES = \
-#  plugin_rest_credential.c
-#libgnunet_plugin_rest_credential_la_LIBADD = \
-#  $(top_builddir)/src/credential/libgnunetcredential.la \
-#       $(top_builddir)/src/rest/libgnunetrest.la \
-#       $(top_builddir)/src/identity/libgnunetidentity.la \
-#  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-#  $(LTLIBINTL) -ljansson -lmicrohttpd
-#libgnunet_plugin_rest_credential_la_LDFLAGS = \
-# $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_copying_la_SOURCES = \
-  plugin_rest_copying.c
-libgnunet_plugin_rest_copying_la_LIBADD = \
-        $(top_builddir)/src/rest/libgnunetrest.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -lmicrohttpd
-libgnunet_plugin_rest_copying_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_peerinfo_la_SOURCES = \
-  plugin_rest_peerinfo.c
-libgnunet_plugin_rest_peerinfo_la_LIBADD = \
-  $(top_builddir)/src/hello/libgnunethello.la \
-        $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(top_builddir)/src/rest/libgnunetrest.la \
-  $(top_builddir)/src/json/libgnunetjson.la \
-  $(top_builddir)/src/transport/libgnunettransport.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_identity_la_SOURCES = \
-  plugin_rest_identity.c
-libgnunet_plugin_rest_identity_la_LIBADD = \
-        $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/rest/libgnunetrest.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_identity_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_namestore_la_SOURCES = \
-  plugin_rest_namestore.c
-libgnunet_plugin_rest_namestore_la_LIBADD = \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/rest/libgnunetrest.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/json/libgnunetjson.la \
-  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_namestore_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_gns_la_SOURCES = \
-  plugin_rest_gns.c
-libgnunet_plugin_rest_gns_la_LIBADD = \
-  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-        $(top_builddir)/src/rest/libgnunetrest.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/json/libgnunetjson.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_gns_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_openid_connect_la_SOURCES = \
-  plugin_rest_openid_connect.c \
-        oidc_helper.h \
-        oidc_helper.c
-libgnunet_plugin_rest_openid_connect_la_LIBADD = \
-        $(top_builddir)/src/identity/libgnunetidentity.la \
-        $(top_builddir)/src/reclaim/libgnunetreclaim.la \
-        $(top_builddir)/src/rest/libgnunetrest.la \
-        $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
-        $(top_builddir)/src/namestore/libgnunetnamestore.la \
-$(top_builddir)/src/gns/libgnunetgns.la \
-        $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
diff --git a/src/rest/Makefile.am b/src/rest/Makefile.am
index 6c23ad2a6..acb95140b 100644
--- a/src/rest/Makefile.am
+++ b/src/rest/Makefile.am
@@ -20,14 +20,27 @@ if USE_COVERAGE
 endif
 lib_LTLIBRARIES = \
-        libgnunetrest.la 
+  libgnunetrest.la 
 libexec_PROGRAMS = \
 gnunet-rest-server
+plugin_LTLIBRARIES = libgnunet_plugin_rest_copying.la 
 EXTRA_DIST = \
 rest.conf
+libgnunet_plugin_rest_copying_la_SOURCES = \
+  plugin_rest_copying.c
+libgnunet_plugin_rest_copying_la_LIBADD = \
+  libgnunetrest.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -lmicrohttpd
+libgnunet_plugin_rest_copying_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
 gnunet_rest_server_SOURCES = \
 gnunet-rest-server.c
diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c
index 77f3d898d..3cbb750ba 100644
--- a/src/rest/gnunet-rest-server.c
+++ b/src/rest/gnunet-rest-server.c
@@ -64,6 +64,16 @@
 static struct GNUNET_SCHEDULER_Task *httpd_task;
 /**
+ * The address to bind to
+ */
+static in_addr_t address;
+/**
+ * The IPv6 address to bind to
+ */
+static struct in6_addr address6;
+/**
 * The port the service is running on (default 7776)
 */
 static unsigned long long port = GNUNET_REST_SERVICE_PORT;
@@ -406,11 +416,11 @@ create_response (void *cls,
    con_handle->data_handle = rest_conndata_handle;
    MHD_get_connection_values (con,
                               MHD_GET_ARGUMENT_KIND,
-                               &url_iterator,
+                               (MHD_KeyValueIterator) &url_iterator,
                               rest_conndata_handle);
    MHD_get_connection_values (con,
                               MHD_HEADER_KIND,
-                               &header_iterator,
+                               (MHD_KeyValueIterator) &header_iterator,
                               rest_conndata_handle);
    con_handle->pp = MHD_create_post_processor(con,
                                               65536,
@@ -695,6 +705,7 @@ bind_v4 ()
  memset (&sa4, 0, sizeof (sa4));
  sa4.sin_family = AF_INET;
  sa4.sin_port = htons (port);
+  sa4.sin_addr.s_addr = address;
 #if HAVE_SOCKADDR_IN_SIN_LEN
  sa4.sin_len = sizeof (sa4);
 #endif
@@ -731,6 +742,7 @@ bind_v6 ()
  memset (&sa6, 0, sizeof (sa6));
  sa6.sin6_family = AF_INET6;
  sa6.sin6_port = htons (port);
+  sa6.sin6_addr = address6;
 #if HAVE_SOCKADDR_IN_SIN_LEN
  sa6.sin6_len = sizeof (sa6);
 #endif
@@ -806,9 +818,56 @@ run (void *cls,
     const char *cfgfile,
     const struct GNUNET_CONFIGURATION_Handle *c)
 {
+  char* addr_str;
  cfg = c;
  plugin_map = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO);
+  /* Get address to bind to */
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "rest",
+                                                          "BIND_TO",
+                                                          &addr_str))
+  {
+    //No address specified
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Don't know what to bind to...\n");
+    GNUNET_free (addr_str);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  if (1 != inet_pton (AF_INET, addr_str, &address))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unable to parse address %s\n",
+                addr_str);
+    GNUNET_free (addr_str);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  GNUNET_free (addr_str);
+  /* Get address to bind to */
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "rest",
+                                                          "BIND_TO6",
+                                                          &addr_str))
+  {
+    //No address specified
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Don't know what to bind6 to...\n");
+    GNUNET_free (addr_str);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  if (1 != inet_pton (AF_INET6, addr_str, &address6))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unable to parse IPv6 address %s\n",
+                addr_str);
+    GNUNET_free (addr_str);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  GNUNET_free (addr_str);
  /* Get CORS data from cfg */
  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "rest",
                                                          "REST_ALLOW_ORIGIN",
diff --git a/src/rest-plugins/plugin_rest_copying.c b/src/rest/plugin_rest_copying.c
index 92c2c6601..92c2c6601 100644
--- a/src/rest-plugins/plugin_rest_copying.c
+++ b/src/rest/plugin_rest_copying.c
diff --git a/src/rest/rest.conf b/src/rest/rest.conf
index 138751696..bef8cf473 100644
--- a/src/rest/rest.conf
+++ b/src/rest/rest.conf
@@ -1,6 +1,8 @@
 [rest]
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-rest.sock
 BINARY=gnunet-rest-server
+BIND_TO=127.0.0.1
+BIND_TO6=::1
 REST_PORT=7776
 REST_ALLOW_HEADERS=Authorization,Accept,Content-Type
 REST_ALLOW_ORIGIN=*
diff --git a/src/revocation/test_local_revocation.py.in b/src/revocation/test_local_revocation.py.in
index 5caa616ca..4cc6119ca 100644
--- a/src/revocation/test_local_revocation.py.in
+++ b/src/revocation/test_local_revocation.py.in
@@ -18,8 +18,7 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 # Testcase for ego revocation
-from __future__ import print_function
-from builtins import str
 import sys
 import os
 import subprocess
diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c
index 9aa786334..af27546f2 100644
--- a/src/rps/gnunet-rps-profiler.c
+++ b/src/rps/gnunet-rps-profiler.c
@@ -84,29 +84,31 @@ enum STAT_TYPE
  STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL, /*   5 */
  STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL,   /*   6 */
  STAT_TYPE_ISSUED_PUSH_SEND,         /*   7 */
-  STAT_TYPE_ISSUED_PULL_REQ,          /*   8 */
+  STAT_TYPE_ISSUED_PUSH_SEND_MH,      /*   8 */
-  STAT_TYPE_ISSUED_PULL_REQ_MH,       /*   9 */
+  STAT_TYPE_ISSUED_PULL_REQ,          /*   9 */
-  STAT_TYPE_ISSUED_PULL_REP,          /*  10 */
+  STAT_TYPE_ISSUED_PULL_REQ_MH,       /*  10 */
-  STAT_TYPE_SENT_PUSH_SEND,           /*  11 */
+  STAT_TYPE_ISSUED_PULL_REP,          /*  11 */
-  STAT_TYPE_SENT_PULL_REQ,            /*  12 */
+  STAT_TYPE_SENT_PUSH_SEND,           /*  12 */
-  STAT_TYPE_SENT_PULL_REQ_MH,         /*  13 */
+  STAT_TYPE_SENT_PULL_REQ,            /*  13 */
-  STAT_TYPE_SENT_PULL_REP,            /*  14 */
+  STAT_TYPE_SENT_PULL_REQ_MH,         /*  14 */
-  STAT_TYPE_RECV_PUSH_SEND,           /*  15 */
+  STAT_TYPE_SENT_PULL_REP,            /*  15 */
-  STAT_TYPE_RECV_PULL_REQ,            /*  16 */
+  STAT_TYPE_RECV_PUSH_SEND,           /*  16 */
-  STAT_TYPE_RECV_PULL_REQ_MH,         /*  17 */
+  STAT_TYPE_RECV_PUSH_SEND_MH,        /*  17 */
-  STAT_TYPE_RECV_PULL_REP,            /*  18 */
+  STAT_TYPE_RECV_PULL_REQ,            /*  18 */
-  STAT_TYPE_RECV_PULL_REP_MH,         /*  19 */
+  STAT_TYPE_RECV_PULL_REQ_MH,         /*  19 */
-  STAT_TYPE_VIEW_SIZE,                /*  20 */
+  STAT_TYPE_RECV_PULL_REP,            /*  20 */
-  STAT_TYPE_KNOWN_PEERS,              /*  21 */
+  STAT_TYPE_RECV_PULL_REP_MH,         /*  21 */
-  STAT_TYPE_VALID_PEERS,              /*  22 */
+  STAT_TYPE_VIEW_SIZE,                /*  22 */
-  STAT_TYPE_LEARND_PEERS,             /*  23 */
+  STAT_TYPE_KNOWN_PEERS,              /*  23 */
-  STAT_TYPE_PENDING_ONLINE_CHECKS,    /*  24 */
+  STAT_TYPE_VALID_PEERS,              /*  24 */
-  STAT_TYPE_UNREQUESTED_PULL_REPLIES, /*  25 */
+  STAT_TYPE_LEARND_PEERS,             /*  25 */
-  STAT_TYPE_PEERS_IN_PUSH_MAP,        /*  26 */
+  STAT_TYPE_PENDING_ONLINE_CHECKS,    /*  26 */
-  STAT_TYPE_PEERS_IN_PULL_MAP,        /*  27 */
+  STAT_TYPE_UNREQUESTED_PULL_REPLIES, /*  27 */
-  STAT_TYPE_PEERS_IN_VIEW,            /*  28 */
+  STAT_TYPE_PEERS_IN_PUSH_MAP,        /*  28 */
-  STAT_TYPE_VIEW_SIZE_AIM,            /*  29 */
+  STAT_TYPE_PEERS_IN_PULL_MAP,        /*  29 */
-  STAT_TYPE_MAX,                      /*  30 */
+  STAT_TYPE_PEERS_IN_VIEW,            /*  30 */
+  STAT_TYPE_VIEW_SIZE_AIM,            /*  31 */
+  STAT_TYPE_MAX,                      /*  32 */
 };
 static char* stat_type_strings[] = {
@@ -118,6 +120,7 @@ static char* stat_type_strings[] = {
  "# rounds blocked - too many pushes, no pull replies",
  "# rounds blocked - no pushes, no pull replies",
  "# push send issued",
+  "# push send issued (multi-hop peer)",
  "# pull request send issued",
  "# pull request send issued (multi-hop peer)",
  "# pull reply send issued",
@@ -126,6 +129,7 @@ static char* stat_type_strings[] = {
  "# pull requests sent (multi-hop peer)",
  "# pull replys sent",
  "# push message received",
+  "# push message received (multi-hop peer)",
  "# pull request message received",
  "# pull request message received (multi-hop peer)",
  "# pull reply messages received",
@@ -206,6 +210,12 @@ enum STAT_TYPE stat_str_2_type (const char *stat_str)
  {
    return STAT_TYPE_ISSUED_PUSH_SEND;
  }
+  else if (0 == strncmp (stat_type_strings[STAT_TYPE_ISSUED_PUSH_SEND_MH],
+                         stat_str,
+                         strlen (stat_type_strings[STAT_TYPE_ISSUED_PUSH_SEND_MH])))
+  {
+    return STAT_TYPE_ISSUED_PUSH_SEND_MH;
+  }
  else if (0 == strncmp (stat_type_strings[STAT_TYPE_ISSUED_PULL_REQ],
                         stat_str,
                         strlen (stat_type_strings[STAT_TYPE_ISSUED_PULL_REQ])))
@@ -254,6 +264,12 @@ enum STAT_TYPE stat_str_2_type (const char *stat_str)
  {
    return STAT_TYPE_RECV_PUSH_SEND;
  }
+  else if (0 == strncmp (stat_type_strings[STAT_TYPE_RECV_PUSH_SEND_MH],
+                         stat_str,
+                         strlen (stat_type_strings[STAT_TYPE_RECV_PUSH_SEND_MH])))
+  {
+    return STAT_TYPE_RECV_PUSH_SEND_MH;
+  }
  else if (0 == strncmp (stat_type_strings[STAT_TYPE_RECV_PULL_REQ],
                         stat_str,
                         strlen (stat_type_strings[STAT_TYPE_RECV_PULL_REQ])))
@@ -2461,9 +2477,9 @@ void write_final_stats (void){
             "%s, %" /* id */
             PRIu64 ", %" /* rounds */
             PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" /* blocking */
-             PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" /* issued */
+             PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" /* issued */
             PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" /* sent */
-             PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" /* recv */
+             PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" /* recv */
             PRIu64 ", %" /* view size */
             PRIu64 ", %" /* known peers */
             PRIu64 ", %" /* valid peers */
@@ -2484,6 +2500,7 @@ void write_final_stats (void){
             rps_peers[i].stats[STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL],
             rps_peers[i].stats[STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL],
             rps_peers[i].stats[STAT_TYPE_ISSUED_PUSH_SEND],
+             rps_peers[i].stats[STAT_TYPE_ISSUED_PUSH_SEND_MH],
             rps_peers[i].stats[STAT_TYPE_ISSUED_PULL_REQ],
             rps_peers[i].stats[STAT_TYPE_ISSUED_PULL_REQ_MH],
             rps_peers[i].stats[STAT_TYPE_ISSUED_PULL_REP],
@@ -2492,6 +2509,7 @@ void write_final_stats (void){
             rps_peers[i].stats[STAT_TYPE_SENT_PULL_REQ_MH],
             rps_peers[i].stats[STAT_TYPE_SENT_PULL_REP],
             rps_peers[i].stats[STAT_TYPE_RECV_PUSH_SEND],
+             rps_peers[i].stats[STAT_TYPE_RECV_PUSH_SEND_MH],
             rps_peers[i].stats[STAT_TYPE_RECV_PULL_REQ],
             rps_peers[i].stats[STAT_TYPE_RECV_PULL_REQ_MH],
             rps_peers[i].stats[STAT_TYPE_RECV_PULL_REP_MH],
@@ -2517,9 +2535,9 @@ void write_final_stats (void){
           "SUM %"
           PRIu64 " %" /* rounds */
           PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" /* blocking */
-           PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" /* issued */
+           PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" /* issued */
           PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" /* sent */
-           PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" /* recv */
+           PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" /* recv */
           PRIu64 ", %" /* view size */
           PRIu64 ", %" /* known peers */
           PRIu64 ", %" /* valid peers */
@@ -2538,6 +2556,7 @@ void write_final_stats (void){
           sums[STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL],
           sums[STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL],
           sums[STAT_TYPE_ISSUED_PUSH_SEND],
+           sums[STAT_TYPE_ISSUED_PUSH_SEND_MH],
           sums[STAT_TYPE_ISSUED_PULL_REQ],
           sums[STAT_TYPE_ISSUED_PULL_REQ_MH],
           sums[STAT_TYPE_ISSUED_PULL_REP],
@@ -2546,6 +2565,7 @@ void write_final_stats (void){
           sums[STAT_TYPE_SENT_PULL_REQ_MH],
           sums[STAT_TYPE_SENT_PULL_REP],
           sums[STAT_TYPE_RECV_PUSH_SEND],
+           sums[STAT_TYPE_RECV_PUSH_SEND_MH],
           sums[STAT_TYPE_RECV_PULL_REQ],
           sums[STAT_TYPE_RECV_PULL_REQ_MH],
           sums[STAT_TYPE_RECV_PULL_REP],
@@ -2855,6 +2875,7 @@ run (void *cls,
                                    BIT(STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL) |
                                    BIT(STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL) |
                                    BIT(STAT_TYPE_ISSUED_PUSH_SEND) |
+                                    BIT(STAT_TYPE_ISSUED_PUSH_SEND_MH) |
                                    BIT(STAT_TYPE_ISSUED_PULL_REQ) |
                                    BIT(STAT_TYPE_ISSUED_PULL_REQ_MH) |
                                    BIT(STAT_TYPE_ISSUED_PULL_REP) |
@@ -2863,6 +2884,7 @@ run (void *cls,
                                    BIT(STAT_TYPE_SENT_PULL_REQ_MH) |
                                    BIT(STAT_TYPE_SENT_PULL_REP) |
                                    BIT(STAT_TYPE_RECV_PUSH_SEND) |
+                                    BIT(STAT_TYPE_RECV_PUSH_SEND_MH) |
                                    BIT(STAT_TYPE_RECV_PULL_REQ) |
                                    BIT(STAT_TYPE_RECV_PULL_REQ_MH) |
                                    BIT(STAT_TYPE_RECV_PULL_REP) |
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 63d4c1865..1871ef006 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -3500,6 +3500,15 @@ handle_peer_push (void *cls,
  if (channel_ctx->peer_ctx->sub == msub)
  {
    GNUNET_STATISTICS_update(stats, "# push message received", 1, GNUNET_NO);
+    if (NULL != map_single_hop &&
+        GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (map_single_hop,
+                                                             peer))
+    {
+      GNUNET_STATISTICS_update (stats,
+                                "# push message received (multi-hop peer)",
+                                1,
+                                GNUNET_NO);
+    }
  }
  #if ENABLE_MALICIOUS
@@ -3881,6 +3890,15 @@ send_push (struct PeerContext *peer_ctx)
                              "# push send issued",
                              1,
                              GNUNET_NO);
+    if (NULL != map_single_hop &&
+        GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (map_single_hop,
+                                                             &peer_ctx->peer_id))
+    {
+      GNUNET_STATISTICS_update (stats,
+                                "# push send issued (multi-hop peer)",
+                                1,
+                                GNUNET_NO);
+    }
  }
 }
diff --git a/src/rps/rps-test_util.h b/src/rps/rps-test_util.h
index ace833034..5009073d0 100644
--- a/src/rps/rps-test_util.h
+++ b/src/rps/rps-test_util.h
@@ -65,7 +65,7 @@ close_all_files ();
 #define to_file(file_name, ...) do { \
    char tmp_buf[512] = "";\
    int size;\
-    if (NULL == file_name) return; \
+    if (NULL == file_name) break; \
    size = GNUNET_snprintf(tmp_buf,sizeof(tmp_buf),__VA_ARGS__);\
    if (0 > size)\
      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,\
diff --git a/src/statistics/test_gnunet_statistics.py.in b/src/statistics/test_gnunet_statistics.py.in
index 64e66f238..b14dc9d9e 100644
--- a/src/statistics/test_gnunet_statistics.py.in
+++ b/src/statistics/test_gnunet_statistics.py.in
@@ -1,5 +1,5 @@
 #!@PYTHON@
-from __future__ import print_function
 import os
 import sys
 import shutil
diff --git a/src/transport/benchmark.sh b/src/transport/benchmark.sh
index 6ae68af2a..a29e6ec2d 100755
--- a/src/transport/benchmark.sh
+++ b/src/transport/benchmark.sh
@@ -1,15 +1,13 @@
-#/bin/sh
+#!/bin/sh
-for i in {1..0}
+for i in $(seq 1 0)
 do
 echo RUN $i
 ./test_transport_api_reliability_http
 done
-for i in {1..100}
+for i in $(seq 1 100)
 do
 echo RUN $i
 ./test_transport_api_reliability_https
 done
- 
- 
-\ No newline at end of file
diff --git a/src/transport/install-bluetooth-helper.sh b/src/transport/install-bluetooth-helper.sh
index 409078759..5c40250fa 100755
--- a/src/transport/install-bluetooth-helper.sh
+++ b/src/transport/install-bluetooth-helper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # $1 - bindir
 # $2 - sudo binary (optional)
 $2 chown root:root $1/gnunet-helper-transport-bluetooth || true
diff --git a/src/transport/install-wlan-helper.sh b/src/transport/install-wlan-helper.sh
index 54b3360be..0fa9c9806 100755
--- a/src/transport/install-wlan-helper.sh
+++ b/src/transport/install-wlan-helper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # $1 - bindir
 # $2 - sudo binary (optional)
 $2 chown root:root $1/gnunet-helper-transport-wlan || true
diff --git a/src/transport/profile_transport.sh b/src/transport/profile_transport.sh
index aa5c4a88f..0e6935fc7 100755
--- a/src/transport/profile_transport.sh
+++ b/src/transport/profile_transport.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 C_ITERATIONS=5
 C_MESSAGE_DELTA=10
@@ -11,7 +11,7 @@ C_MESSAGE_END=2000
 # done
-for ((cur=$C_MESSAGE_START; cur<=$C_MESSAGE_END; cur = cur + $C_MESSAGE_DELTA))
+for $((cur=$C_MESSAGE_START; cur<=$C_MESSAGE_END; cur = cur + $C_MESSAGE_DELTA))
 {
        ./gnunet-transport-profiler -p  NSGWRTMHG2YJK9KZSTEWKJ5TK20AGRDBWHFA1ZNKKZ7T360MZ8S0 -s -c perf_https_peer1.conf -n 20240 -m $cur -i 4
        sleep 1
diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c
index 361fa55d6..f700428a2 100644
--- a/src/util/gnunet-config.c
+++ b/src/util/gnunet-config.c
@@ -73,9 +73,9 @@ static int rewrite;
 */
 static void
 print_option (void *cls,
-              const char *section,
+              const char *section,
-              const char *option,
+              const char *option,
-              const char *value)
+              const char *value)
 {
  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
@@ -86,27 +86,27 @@ print_option (void *cls,
    char *fn;
    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONFIGURATION_get_value_filename (cfg,
+                   GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                                            section,
+                                                            section,
-                                                            option,
+                                                            option,
-                                                            &value_fn));
+                                                            &value_fn));
    fn = GNUNET_STRINGS_filename_expand (value_fn);
    if (NULL == fn)
      fn = value_fn;
    else
      GNUNET_free (value_fn);
    fprintf (stdout,
-             "%s = %s\n",
+             "%s = %s\n",
-             option,
+             option,
-             fn);
+             fn);
    GNUNET_free (fn);
  }
  else
  {
    fprintf (stdout,
-             "%s = %s\n",
+             "%s = %s\n",
-             option,
+             option,
-             value);
+             value);
  }
 }
@@ -123,8 +123,8 @@ print_section_name (void *cls,
 {
  (void) cls;
  fprintf (stdout,
-           "%s\n",
+           "%s\n",
-           section);
+           section);
 }
@@ -133,7 +133,8 @@ print_section_name (void *cls,
 *
 * @param cls closure
 * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param cfgfile name of the configuration file used (for saving,
+ *                                                     can be NULL!)
 * @param cfg configuration
 */
 static void
@@ -192,35 +193,36 @@ run (void *cls,
    {
      GNUNET_CONFIGURATION_iterate_section_values (cfg,
                                                   section,
-                                                  &print_option,
+                                                   &print_option,
                                                   (void *) cfg);
    }
    else
    {
      if (is_filename)
      {
-        if (GNUNET_OK !=
+        if (GNUNET_OK !=
-            GNUNET_CONFIGURATION_get_value_filename (cfg,
+            GNUNET_CONFIGURATION_get_value_filename (cfg,
                                                     section,
                                                     option,
                                                     &value))
-        {
+        {
-          GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+          GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                                     section, option);
+                                     section, option);
-          ret = 3;
+          ret = 3;
          goto cleanup;
-        }
+        }
      }
      else
      {
-        if (GNUNET_OK !=
+        if (GNUNET_OK !=
-            GNUNET_CONFIGURATION_get_value_string (cfg, section, option, &value))
+            GNUNET_CONFIGURATION_get_value_string (cfg, section,
-        {
+                                                   option, &value))
-          GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+        {
-                                     section, option);
+          GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-          ret = 3;
+                                     section, option);
+          ret = 3;
          goto cleanup;
-        }
+        }
      }
      fprintf (stdout, "%s\n", value);
    }
@@ -245,10 +247,10 @@ run (void *cls,
    const char *xdg = getenv ("XDG_CONFIG_HOME");
    if (NULL != xdg)
      GNUNET_asprintf (&cfg_fn,
-                       "%s%s%s",
+                       "%s%s%s",
-                       xdg,
+                       xdg,
-                       DIR_SEPARATOR_STR,
+                       DIR_SEPARATOR_STR,
-                       GNUNET_OS_project_data_get ()->config_file);
+                       GNUNET_OS_project_data_get ()->config_file);
    else
      cfg_fn = GNUNET_strdup (GNUNET_OS_project_data_get ()->user_config_file);
    cfgfile = cfg_fn;
@@ -256,14 +258,14 @@ run (void *cls,
  if ( (NULL != diff) || (NULL != out) )
  {
    if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_write ((NULL == out) ? diff : out,
+        GNUNET_CONFIGURATION_write ((NULL == out) ? diff : out,
                                    cfgfile))
      ret = 2;
  }
  GNUNET_free_non_null (cfg_fn);
  if (NULL != out)
    GNUNET_CONFIGURATION_destroy (out);
- cleanup:
+cleanup:
  if (NULL != diff)
    GNUNET_CONFIGURATION_destroy (diff);
 }
@@ -282,32 +284,32 @@ main (int argc,
 {
  struct GNUNET_GETOPT_CommandLineOption options[] = {
    GNUNET_GETOPT_option_flag ('f',
-                               "filename",
+      "filename",
-                               gettext_noop ("obtain option of value as a filename (with $-expansion)"),
+      gettext_noop ("interpret option value as a filename (with $-expansion)"),
-                               &is_filename),
+      &is_filename),
    GNUNET_GETOPT_option_string ('s',
-                                 "section",
+                                "section",
-                                 "SECTION",
+                                "SECTION",
-                                 gettext_noop ("name of the section to access"),
+                                gettext_noop ("name of the section to access"),
-                                 &section),
+                                &section),
    GNUNET_GETOPT_option_string ('o',
-                                 "option",
+                                 "option",
-                                 "OPTION",
+                                 "OPTION",
-                                 gettext_noop ("name of the option to access"),
+                                 gettext_noop ("name of the option to access"),
-                                 &option),
+                                 &option),
    GNUNET_GETOPT_option_string ('V',
-                                 "value",
+                                 "value",
-                                 "VALUE",
+                                 "VALUE",
-                                 gettext_noop ("value to set"),
+                                 gettext_noop ("value to set"),
-                                 &value),
+                                 &value),
    GNUNET_GETOPT_option_flag ('S',
-                               "list-sections",
+                       "list-sections",
-                               gettext_noop ("print available configuration sections"),
+                       gettext_noop ("print available configuration sections"),
-                               &list_sections),
+                       &list_sections),
    GNUNET_GETOPT_option_flag ('w',
-                               "rewrite",
+                               "rewrite",
-                               gettext_noop ("write configuration file that only contains delta to defaults"),
+                               gettext_noop ("write configuration file that only contains delta to defaults"),
-                               &rewrite),
+                               &rewrite),
    GNUNET_GETOPT_OPTION_END
  };
  if (GNUNET_OK !=
@@ -316,12 +318,12 @@ main (int argc,
    return 2;
  ret = (GNUNET_OK ==
-         GNUNET_PROGRAM_run (argc,
+         GNUNET_PROGRAM_run (argc,
-                             argv,
+                        argv,
-                             "gnunet-config [OPTIONS]",
+                        "gnunet-config [OPTIONS]",
-                             gettext_noop ("Manipulate GNUnet configuration files"),
+                        gettext_noop ("Manipulate GNUnet configuration files"),
-                             options,
+                        options,
-                             &run, NULL)) ? 0 : ret;
+                        &run, NULL)) ? 0 : ret;
  GNUNET_free ((void*) argv);
  return ret;
 }
diff --git a/src/util/gnunet-qr.c b/src/util/gnunet-qr.c
index 1106d5cb2..fa95d6c05 100644
--- a/src/util/gnunet-qr.c
+++ b/src/util/gnunet-qr.c
@@ -17,7 +17,12 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
+/**
+ * @file util/gnunet-qr.c
+ * @author Hartmut Goebel (original implementation)
+ * @author Martin Schanzenbach (integrate gnunet-uri)
+ * @author Christian Grothoff (error handling)
+ */
 #include <stdio.h>
 #include <zbar.h>
 #include <stdbool.h>
@@ -26,18 +31,35 @@
 #define LOG(fmt, ...) if (verbose == true) printf(fmt, ## __VA_ARGS__)
-// Command line options
+/**
+ * Video device to capture from. Sane default for GNU/Linux systems.
+ */
 static char* device = "/dev/video0";
+/**
+ * --verbose option
+ */
 static int verbose = false;
+/**
+ * --silent option
+ */
 static int silent = false;
-// Handler exit code
+/**
+ * Handler exit code
+ */
 static long unsigned int exit_code = 1;
-// Helper process we started.
+/**
+ * Helper process we started.
+ */
 static struct GNUNET_OS_Process *p;
-// Pipe used to communicate shutdown via signal.
+/**
+ * Pipe used to communicate child death via signal.
+ */
 static struct GNUNET_DISK_PipeHandle *sigpipe;
@@ -69,8 +91,10 @@ maint_child_death (void *cls)
 * @param cfg configuration
 */
 static void
-gnunet_uri (void *cls, const char *uri, const char *cfgfile,
+gnunet_uri (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+            const char *uri,
+            const char *cfgfile,
+            const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
  const char *orig_uri;
  const char *slash;
@@ -88,7 +112,8 @@ gnunet_uri (void *cls, const char *uri, const char *cfgfile,
  uri += strlen ("gnunet://");
  if (NULL == (slash = strchr (uri, '/')))
  {
-    fprintf (stderr, _("Invalid URI: fails to specify subsystem\n"));
+    fprintf (stderr,
+             _("Invalid URI: fails to specify subsystem\n"));
    return;
  }
  subsystem = GNUNET_strndup (uri, slash - uri);
@@ -98,7 +123,9 @@ gnunet_uri (void *cls, const char *uri, const char *cfgfile,
                                             subsystem,
                                             &program))
  {
-    fprintf (stderr, _("No handler known for subsystem `%s'\n"), subsystem);
+    fprintf (stderr,
+             _("No handler known for subsystem `%s'\n"),
+             subsystem);
    GNUNET_free (subsystem);
    return;
  }
@@ -120,6 +147,111 @@ gnunet_uri (void *cls, const char *uri, const char *cfgfile,
 /**
+ * Obtain QR code 'symbol' from @a proc.
+ *
+ * @param proc zbar processor to use
+ * @return NULL on error
+ */
+static const zbar_symbol_t *
+get_symbol (zbar_processor_t *proc)
+{
+  const zbar_symbol_set_t* symbols;
+  int rc;
+  int n;
+  if (0 !=
+      zbar_processor_parse_config (proc, "enable"))
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  /* initialize the Processor */
+  if (0 !=
+      (rc = zbar_processor_init(proc, device, 1)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to open device `%s': %d\n",
+                device,
+                rc);
+    return NULL;
+  }
+  /* enable the preview window */
+  if ( (0 != (rc = zbar_processor_set_visible (proc, 1))) ||
+       (0 != (rc = zbar_processor_set_active(proc, 1))) )
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  /* read at least one barcode (or until window closed) */
+  LOG ("Capturing\n");
+  n = zbar_process_one (proc, -1);
+  /* hide the preview window */
+  (void) zbar_processor_set_active (proc, 0);
+  (void) zbar_processor_set_visible (proc, 0);
+  if (-1 == n)
+    return NULL; /* likely user closed the window */
+  LOG ("Got %i images\n",
+       n);
+  /* extract results */
+  symbols = zbar_processor_get_results (proc);
+  if (NULL == symbols)
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  return zbar_symbol_set_first_symbol (symbols);
+}
+/**
+ * Run zbar QR code parser.
+ *
+ * @return NULL on error, otherwise the URI that we found
+ */
+static char *
+run_zbar ()
+{
+  zbar_processor_t *proc;
+  const char *data;
+  char *ret;
+  const zbar_symbol_t* symbol;
+  /* configure the Processor */
+  proc = zbar_processor_create (1);
+  if (NULL == proc)
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  symbol = get_symbol (proc);
+  if (NULL == symbol)
+  {
+    zbar_processor_destroy (proc);
+    return NULL;
+  }
+  data = zbar_symbol_get_data (symbol);
+  if (NULL == data)
+  {
+    GNUNET_break (0);
+    zbar_processor_destroy (proc);
+    return NULL;
+  }
+  LOG ("Found %s \"%s\"\n",
+       zbar_get_symbol_name (zbar_symbol_get_type(symbol)),
+       data);
+  ret = GNUNET_strdup (data);
+  /* clean up */
+  zbar_processor_destroy(proc);
+  return ret;
+}
+/**
 * Main function that will be run by the scheduler.
 *
 * @param cls closure
@@ -133,65 +265,33 @@ run (void *cls,
     const char *cfgfile,
     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  /* create a Processor */
+  char *data;
-  LOG("Initializing\n");
-  zbar_processor_t *proc = zbar_processor_create(1);
-  // FIXME: Wrap all this into a function which returns an error on
-  // failure. And here ensure the processor is destroyed at the end.
-  /* configure the Processor */
-  zbar_processor_parse_config(proc, "enable");
-  /* initialize the Processor */
-  LOG("Opening video device %s\n", device);
-  // FIXME: error handling
-  zbar_processor_init(proc, device, 1);
-  /* enable the preview window */
-  zbar_processor_set_visible(proc, 1);
-  zbar_processor_set_active(proc, 1);
-  /* keep scanning until user provides key/mouse input */
-  //zbar_processor_user_wait(proc, -1);
-  // read at least one barcode (or until window closed)
+  data = run_zbar ();
-  LOG("Capturing\n");
+  if (NULL == data)
-  int n;
+    return;
-  n = zbar_process_one(proc, -1);
+  gnunet_uri (cls,
-  LOG("Got %i images\n", n);
+              data,
-  // FIXME: Error handling (n = -1)
+              cfgfile,
+              cfg);
-  // hide the preview window
+  if (exit_code != 0)
-  zbar_processor_set_active(proc, 0);
+  {
-  zbar_processor_set_visible(proc, 0);
+    printf ("Failed to add URI %s\n",
+            data);
-  // extract results
-  const zbar_symbol_set_t* symbols = zbar_processor_get_results(proc);
-  const zbar_symbol_t* symbol = zbar_symbol_set_first_symbol(symbols);
-  if (symbol != NULL) {
-    const char* data = zbar_symbol_get_data(symbol);
-    LOG("Found %s \"%s\"\n",
-        zbar_get_symbol_name(zbar_symbol_get_type(symbol)), data);
-    gnunet_uri(cls, data, cfgfile, cfg);
-    if (exit_code != 0) {
-      printf("Failed to add URI %s\n", data);
-    } else {
-      printf("Added URI %s\n", data);
-    }
  }
+  else
-  /* clean up */
+  {
-  zbar_processor_destroy(proc);
+    printf ("Added URI %s\n",
+            data);
+  }
+  GNUNET_free (data);
 };
 int
 main (int argc, char *const *argv)
 {
-  static int ret;
+  int ret;
  struct GNUNET_GETOPT_CommandLineOption options[] = {
    GNUNET_GETOPT_option_string ('d', "device", "DEVICE",
     gettext_noop ("use video-device DEVICE (default: /dev/video0"),
@@ -204,6 +304,7 @@ main (int argc, char *const *argv)
                               &silent),
    GNUNET_GETOPT_OPTION_END
  };
  ret = GNUNET_PROGRAM_run (argc,
                            argv,
                            "gnunet-qr",
diff --git a/src/vpn/install-vpn-helper.sh b/src/vpn/install-vpn-helper.sh
index 0996e7839..086dabb67 100755
--- a/src/vpn/install-vpn-helper.sh
+++ b/src/vpn/install-vpn-helper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # $1 - bindir
 # $2 - sudo binary (optional)
 $2 chown root:root $1/gnunet-helper-vpn || true
diff --git a/src/vpn/tests/test-helper-icmp.sh b/src/vpn/tests/test-helper-icmp.sh
index eb5bd043b..2d0c8425a 100755
--- a/src/vpn/tests/test-helper-icmp.sh
+++ b/src/vpn/tests/test-helper-icmp.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 /opt/gnunet/bin/gnunet-helper-vpn < ping > result 2>/dev/null &
diff --git a/src/vpn/tests/test-helper-ifaddr.sh b/src/vpn/tests/test-helper-ifaddr.sh
index f64f9aa53..b8fde999d 100755
--- a/src/vpn/tests/test-helper-ifaddr.sh
+++ b/src/vpn/tests/test-helper-ifaddr.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 FIFO=$(mktemp)