264 files changed, 1054 insertions, 140 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 49e734d..8fe2fd7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,14 @@
-2019-03-02	Daniel Baumann <daniel.baumann@open-infrastructure.net>
+2021-08-28	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
-	* Releasing version 20190301-lts1.
+	* Releasing version 20210821.
+
+	[ Daniel Baumann ]
+	* Moving apache files to subdirectory.
+	* Using rst instead of asciidoc for manpage generation.
+	* Adding dehydrated tools.
+	* Adding git tools.
+	* Adding irker tools.
+	* Adding knot-resolver tools.
 
 2019-03-01	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
diff --git a/VERSION.txt b/VERSION.txt
index 7182ca9..31d17e8 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20190301-lts1
+20210828
diff --git a/Makefile b/apache/Makefile
index 0e7140b..90758cf 100644
--- a/Makefile
+++ b/apache/Makefile
@@ -23,10 +23,10 @@ PROGRAM = apache-icons
 
 all: build
 
-build: share/man/*.txt
+build: share/man/*.rst
 	$(MAKE) -C share/man
 
-	sed -n '/^NAME/,$$p' share/man/$(SOFTWARE).7.txt > README.txt
+	sed -n '/^===/,$$p' share/man/$(SOFTWARE).7.rst > README.txt
 
 	for ICON in share/icons/*; \
 	do \
@@ -49,7 +49,7 @@ build: share/man/*.txt
 
 install: build
 	mkdir -p $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
-	cp -r VERSION.txt $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
+	cp -r ../VERSION.txt $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
 	cp -r build/* $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
 
 	for DIRECTORY in $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)/*-png; \
@@ -78,7 +78,7 @@ install: build
 	done
 
 	mkdir -p $(DESTDIR)/usr/share/doc/$(SOFTWARE)
-	cp -r CHANGELOG.txt LICENSE.txt README.txt $(DESTDIR)/usr/share/doc/$(SOFTWARE)
+	cp -r ../CHANGELOG.txt ../LICENSE.txt README.txt $(DESTDIR)/usr/share/doc/$(SOFTWARE)
 
 uninstall:
 	for SECTION in $$(seq 1 8); \
diff --git a/share/apache/conf/000-apache-icons.conf b/apache/share/apache/conf/000-apache-icons.conf
index 7cce24b..7cce24b 100644
--- a/share/apache/conf/000-apache-icons.conf
+++ b/apache/share/apache/conf/000-apache-icons.conf
diff --git a/share/apache/icon.conf.in b/apache/share/apache/icon.conf.in
index c5b2e3e..c5b2e3e 100644
--- a/share/apache/icon.conf.in
+++ b/apache/share/apache/icon.conf.in
diff --git a/share/apache/mods/000-apache-icons.conf b/apache/share/apache/mods/000-apache-icons.conf
index c78afba..c78afba 100644
--- a/share/apache/mods/000-apache-icons.conf
+++ b/apache/share/apache/mods/000-apache-icons.conf
diff --git a/share/apache/mods/000-apache-icons.load b/apache/share/apache/mods/000-apache-icons.load
index 13c35b7..13c35b7 100644
--- a/share/apache/mods/000-apache-icons.load
+++ b/apache/share/apache/mods/000-apache-icons.load
diff --git a/share/common/blank.png b/apache/share/common/blank.png
index 0d1e6f4..0d1e6f4 100644
--- a/share/common/blank.png
+++ b/apache/share/common/blank.png
diff --git a/share/common/blank.svg b/apache/share/common/blank.svg
index 153f89f..153f89f 100644
--- a/share/common/blank.svg
+++ b/apache/share/common/blank.svg
diff --git a/share/icons/awesome/arrow-left.svg b/apache/share/icons/awesome/arrow-left.svg
index 50e9b92..50e9b92 100644
--- a/share/icons/awesome/arrow-left.svg
+++ b/apache/share/icons/awesome/arrow-left.svg
diff --git a/share/icons/awesome/file-archive-o.svg b/apache/share/icons/awesome/file-archive-o.svg
index bd99c37..bd99c37 100644
--- a/share/icons/awesome/file-archive-o.svg
+++ b/apache/share/icons/awesome/file-archive-o.svg
diff --git a/share/icons/awesome/file-audio-o.svg b/apache/share/icons/awesome/file-audio-o.svg
index fe0a167..fe0a167 100644
--- a/share/icons/awesome/file-audio-o.svg
+++ b/apache/share/icons/awesome/file-audio-o.svg
diff --git a/share/icons/awesome/file-code-o.svg b/apache/share/icons/awesome/file-code-o.svg
index 814c888..814c888 100644
--- a/share/icons/awesome/file-code-o.svg
+++ b/apache/share/icons/awesome/file-code-o.svg
diff --git a/share/icons/awesome/file-excel-o.svg b/apache/share/icons/awesome/file-excel-o.svg
index 1f1f067..1f1f067 100644
--- a/share/icons/awesome/file-excel-o.svg
+++ b/apache/share/icons/awesome/file-excel-o.svg
diff --git a/share/icons/awesome/file-image-o.svg b/apache/share/icons/awesome/file-image-o.svg
index 3c411d9..3c411d9 100644
--- a/share/icons/awesome/file-image-o.svg
+++ b/apache/share/icons/awesome/file-image-o.svg
diff --git a/share/icons/awesome/file-o.svg b/apache/share/icons/awesome/file-o.svg
index 4dbf6d9..4dbf6d9 100644
--- a/share/icons/awesome/file-o.svg
+++ b/apache/share/icons/awesome/file-o.svg
diff --git a/share/icons/awesome/file-powerpoint-o.svg b/apache/share/icons/awesome/file-powerpoint-o.svg
index 7689b65..7689b65 100644
--- a/share/icons/awesome/file-powerpoint-o.svg
+++ b/apache/share/icons/awesome/file-powerpoint-o.svg
diff --git a/share/icons/awesome/file-text-o.svg b/apache/share/icons/awesome/file-text-o.svg
index 21fa1bc..21fa1bc 100644
--- a/share/icons/awesome/file-text-o.svg
+++ b/apache/share/icons/awesome/file-text-o.svg
diff --git a/share/icons/awesome/file-video-o.svg b/apache/share/icons/awesome/file-video-o.svg
index 939c471..939c471 100644
--- a/share/icons/awesome/file-video-o.svg
+++ b/apache/share/icons/awesome/file-video-o.svg
diff --git a/share/icons/awesome/file-word-o.svg b/apache/share/icons/awesome/file-word-o.svg
index b98cfb8..b98cfb8 100644
--- a/share/icons/awesome/file-word-o.svg
+++ b/apache/share/icons/awesome/file-word-o.svg
diff --git a/share/icons/awesome/folder-o.svg b/apache/share/icons/awesome/folder-o.svg
index d5d126b..d5d126b 100644
--- a/share/icons/awesome/folder-o.svg
+++ b/apache/share/icons/awesome/folder-o.svg
diff --git a/share/icons/tango/actions/address-book-new.svg b/apache/share/icons/tango/actions/address-book-new.svg
index 600a82c..600a82c 100644
--- a/share/icons/tango/actions/address-book-new.svg
+++ b/apache/share/icons/tango/actions/address-book-new.svg
diff --git a/share/icons/tango/actions/appointment-new.svg b/apache/share/icons/tango/actions/appointment-new.svg
index 4cb14f8..4cb14f8 100644
--- a/share/icons/tango/actions/appointment-new.svg
+++ b/apache/share/icons/tango/actions/appointment-new.svg
diff --git a/share/icons/tango/actions/bookmark-new.svg b/apache/share/icons/tango/actions/bookmark-new.svg
index d6d095b..d6d095b 100644
--- a/share/icons/tango/actions/bookmark-new.svg
+++ b/apache/share/icons/tango/actions/bookmark-new.svg
diff --git a/share/icons/tango/actions/contact-new.svg b/apache/share/icons/tango/actions/contact-new.svg
index 1efb895..1efb895 100644
--- a/share/icons/tango/actions/contact-new.svg
+++ b/apache/share/icons/tango/actions/contact-new.svg
diff --git a/share/icons/tango/actions/document-new.svg b/apache/share/icons/tango/actions/document-new.svg
index 1bfdb16..1bfdb16 100644
--- a/share/icons/tango/actions/document-new.svg
+++ b/apache/share/icons/tango/actions/document-new.svg
diff --git a/share/icons/tango/actions/document-open.svg b/apache/share/icons/tango/actions/document-open.svg
index 55e6177..55e6177 100644
--- a/share/icons/tango/actions/document-open.svg
+++ b/apache/share/icons/tango/actions/document-open.svg
diff --git a/share/icons/tango/actions/document-print-preview.svg b/apache/share/icons/tango/actions/document-print-preview.svg
index d3501ac..d3501ac 100644
--- a/share/icons/tango/actions/document-print-preview.svg
+++ b/apache/share/icons/tango/actions/document-print-preview.svg
diff --git a/share/icons/tango/actions/document-print.svg b/apache/share/icons/tango/actions/document-print.svg
index 0b8837b..0b8837b 100644
--- a/share/icons/tango/actions/document-print.svg
+++ b/apache/share/icons/tango/actions/document-print.svg
diff --git a/share/icons/tango/actions/document-properties.svg b/apache/share/icons/tango/actions/document-properties.svg
index c57f96d..c57f96d 100644
--- a/share/icons/tango/actions/document-properties.svg
+++ b/apache/share/icons/tango/actions/document-properties.svg
diff --git a/share/icons/tango/actions/document-save-as.svg b/apache/share/icons/tango/actions/document-save-as.svg
index 01e2fb7..01e2fb7 100644
--- a/share/icons/tango/actions/document-save-as.svg
+++ b/apache/share/icons/tango/actions/document-save-as.svg
diff --git a/share/icons/tango/actions/document-save.svg b/apache/share/icons/tango/actions/document-save.svg
index 2922c43..2922c43 100644
--- a/share/icons/tango/actions/document-save.svg
+++ b/apache/share/icons/tango/actions/document-save.svg
diff --git a/share/icons/tango/actions/edit-clear.svg b/apache/share/icons/tango/actions/edit-clear.svg
index b2f20d4..b2f20d4 100644
--- a/share/icons/tango/actions/edit-clear.svg
+++ b/apache/share/icons/tango/actions/edit-clear.svg
diff --git a/share/icons/tango/actions/edit-copy.svg b/apache/share/icons/tango/actions/edit-copy.svg
index f4d9e97..f4d9e97 100644
--- a/share/icons/tango/actions/edit-copy.svg
+++ b/apache/share/icons/tango/actions/edit-copy.svg
diff --git a/share/icons/tango/actions/edit-cut.svg b/apache/share/icons/tango/actions/edit-cut.svg
index b9ac930..b9ac930 100644
--- a/share/icons/tango/actions/edit-cut.svg
+++ b/apache/share/icons/tango/actions/edit-cut.svg
diff --git a/share/icons/tango/actions/edit-delete.svg b/apache/share/icons/tango/actions/edit-delete.svg
index 69281e4..69281e4 100644
--- a/share/icons/tango/actions/edit-delete.svg
+++ b/apache/share/icons/tango/actions/edit-delete.svg
diff --git a/share/icons/tango/actions/edit-find-replace.svg b/apache/share/icons/tango/actions/edit-find-replace.svg
index 1f443ff..1f443ff 100644
--- a/share/icons/tango/actions/edit-find-replace.svg
+++ b/apache/share/icons/tango/actions/edit-find-replace.svg
diff --git a/share/icons/tango/actions/edit-find.svg b/apache/share/icons/tango/actions/edit-find.svg
index a499b48..a499b48 100644
--- a/share/icons/tango/actions/edit-find.svg
+++ b/apache/share/icons/tango/actions/edit-find.svg
diff --git a/share/icons/tango/actions/edit-paste.svg b/apache/share/icons/tango/actions/edit-paste.svg
index 39150d7..39150d7 100644
--- a/share/icons/tango/actions/edit-paste.svg
+++ b/apache/share/icons/tango/actions/edit-paste.svg
diff --git a/share/icons/tango/actions/edit-redo.svg b/apache/share/icons/tango/actions/edit-redo.svg
index bc4d52a..bc4d52a 100644
--- a/share/icons/tango/actions/edit-redo.svg
+++ b/apache/share/icons/tango/actions/edit-redo.svg
diff --git a/share/icons/tango/actions/edit-select-all.svg b/apache/share/icons/tango/actions/edit-select-all.svg
index dd52507..dd52507 100644
--- a/share/icons/tango/actions/edit-select-all.svg
+++ b/apache/share/icons/tango/actions/edit-select-all.svg
diff --git a/share/icons/tango/actions/edit-undo.svg b/apache/share/icons/tango/actions/edit-undo.svg
index d3cce96..d3cce96 100644
--- a/share/icons/tango/actions/edit-undo.svg
+++ b/apache/share/icons/tango/actions/edit-undo.svg
diff --git a/share/icons/tango/actions/folder-new.svg b/apache/share/icons/tango/actions/folder-new.svg
index 0791887..0791887 100644
--- a/share/icons/tango/actions/folder-new.svg
+++ b/apache/share/icons/tango/actions/folder-new.svg
diff --git a/share/icons/tango/actions/format-indent-less.svg b/apache/share/icons/tango/actions/format-indent-less.svg
index 00be1f3..00be1f3 100644
--- a/share/icons/tango/actions/format-indent-less.svg
+++ b/apache/share/icons/tango/actions/format-indent-less.svg
diff --git a/share/icons/tango/actions/format-indent-more.svg b/apache/share/icons/tango/actions/format-indent-more.svg
index 2047b62..2047b62 100644
--- a/share/icons/tango/actions/format-indent-more.svg
+++ b/apache/share/icons/tango/actions/format-indent-more.svg
diff --git a/share/icons/tango/actions/format-justify-center.svg b/apache/share/icons/tango/actions/format-justify-center.svg
index d1564f3..d1564f3 100644
--- a/share/icons/tango/actions/format-justify-center.svg
+++ b/apache/share/icons/tango/actions/format-justify-center.svg
diff --git a/share/icons/tango/actions/format-justify-fill.svg b/apache/share/icons/tango/actions/format-justify-fill.svg
index 1ec0949..1ec0949 100644
--- a/share/icons/tango/actions/format-justify-fill.svg
+++ b/apache/share/icons/tango/actions/format-justify-fill.svg
diff --git a/share/icons/tango/actions/format-justify-left.svg b/apache/share/icons/tango/actions/format-justify-left.svg
index c250195..c250195 100644
--- a/share/icons/tango/actions/format-justify-left.svg
+++ b/apache/share/icons/tango/actions/format-justify-left.svg
diff --git a/share/icons/tango/actions/format-justify-right.svg b/apache/share/icons/tango/actions/format-justify-right.svg
index f6f2205..f6f2205 100644
--- a/share/icons/tango/actions/format-justify-right.svg
+++ b/apache/share/icons/tango/actions/format-justify-right.svg
diff --git a/share/icons/tango/actions/format-text-bold.svg b/apache/share/icons/tango/actions/format-text-bold.svg
index 9268d4e..9268d4e 100644
--- a/share/icons/tango/actions/format-text-bold.svg
+++ b/apache/share/icons/tango/actions/format-text-bold.svg
diff --git a/share/icons/tango/actions/format-text-italic.svg b/apache/share/icons/tango/actions/format-text-italic.svg
index 3a4bc36..3a4bc36 100644
--- a/share/icons/tango/actions/format-text-italic.svg
+++ b/apache/share/icons/tango/actions/format-text-italic.svg
diff --git a/share/icons/tango/actions/format-text-strikethrough.svg b/apache/share/icons/tango/actions/format-text-strikethrough.svg
index 5e87b5e..5e87b5e 100644
--- a/share/icons/tango/actions/format-text-strikethrough.svg
+++ b/apache/share/icons/tango/actions/format-text-strikethrough.svg
diff --git a/share/icons/tango/actions/format-text-underline.svg b/apache/share/icons/tango/actions/format-text-underline.svg
index 22131f6..22131f6 100644
--- a/share/icons/tango/actions/format-text-underline.svg
+++ b/apache/share/icons/tango/actions/format-text-underline.svg
diff --git a/share/icons/tango/actions/go-bottom.svg b/apache/share/icons/tango/actions/go-bottom.svg
index 6cd7c7c..6cd7c7c 100644
--- a/share/icons/tango/actions/go-bottom.svg
+++ b/apache/share/icons/tango/actions/go-bottom.svg
diff --git a/share/icons/tango/actions/go-down.svg b/apache/share/icons/tango/actions/go-down.svg
index 95b82af..95b82af 100644
--- a/share/icons/tango/actions/go-down.svg
+++ b/apache/share/icons/tango/actions/go-down.svg
diff --git a/share/icons/tango/actions/go-first.svg b/apache/share/icons/tango/actions/go-first.svg
index 4e0b668..4e0b668 100644
--- a/share/icons/tango/actions/go-first.svg
+++ b/apache/share/icons/tango/actions/go-first.svg
diff --git a/share/icons/tango/actions/go-home.svg b/apache/share/icons/tango/actions/go-home.svg
index 4f16958..4f16958 100644
--- a/share/icons/tango/actions/go-home.svg
+++ b/apache/share/icons/tango/actions/go-home.svg
diff --git a/share/icons/tango/actions/go-jump.svg b/apache/share/icons/tango/actions/go-jump.svg
index 4832fe9..4832fe9 100644
--- a/share/icons/tango/actions/go-jump.svg
+++ b/apache/share/icons/tango/actions/go-jump.svg
diff --git a/share/icons/tango/actions/go-last.svg b/apache/share/icons/tango/actions/go-last.svg
index 00af499..00af499 100644
--- a/share/icons/tango/actions/go-last.svg
+++ b/apache/share/icons/tango/actions/go-last.svg
diff --git a/share/icons/tango/actions/go-next.svg b/apache/share/icons/tango/actions/go-next.svg
index 41e5990..41e5990 100644
--- a/share/icons/tango/actions/go-next.svg
+++ b/apache/share/icons/tango/actions/go-next.svg
diff --git a/share/icons/tango/actions/go-previous.svg b/apache/share/icons/tango/actions/go-previous.svg
index d5381de..d5381de 100644
--- a/share/icons/tango/actions/go-previous.svg
+++ b/apache/share/icons/tango/actions/go-previous.svg
diff --git a/share/icons/tango/actions/go-top.svg b/apache/share/icons/tango/actions/go-top.svg
index 4ee94d3..4ee94d3 100644
--- a/share/icons/tango/actions/go-top.svg
+++ b/apache/share/icons/tango/actions/go-top.svg
diff --git a/share/icons/tango/actions/go-up.svg b/apache/share/icons/tango/actions/go-up.svg
index 54263df..54263df 100644
--- a/share/icons/tango/actions/go-up.svg
+++ b/apache/share/icons/tango/actions/go-up.svg
diff --git a/share/icons/tango/actions/list-add.svg b/apache/share/icons/tango/actions/list-add.svg
index 6eaed44..6eaed44 100644
--- a/share/icons/tango/actions/list-add.svg
+++ b/apache/share/icons/tango/actions/list-add.svg
diff --git a/share/icons/tango/actions/list-remove.svg b/apache/share/icons/tango/actions/list-remove.svg
index 5f109a0..5f109a0 100644
--- a/share/icons/tango/actions/list-remove.svg
+++ b/apache/share/icons/tango/actions/list-remove.svg
diff --git a/share/icons/tango/actions/mail-forward.svg b/apache/share/icons/tango/actions/mail-forward.svg
index b159ed5..b159ed5 100644
--- a/share/icons/tango/actions/mail-forward.svg
+++ b/apache/share/icons/tango/actions/mail-forward.svg
diff --git a/share/icons/tango/actions/mail-mark-junk.svg b/apache/share/icons/tango/actions/mail-mark-junk.svg
index 0163175..0163175 100644
--- a/share/icons/tango/actions/mail-mark-junk.svg
+++ b/apache/share/icons/tango/actions/mail-mark-junk.svg
diff --git a/share/icons/tango/actions/mail-message-new.svg b/apache/share/icons/tango/actions/mail-message-new.svg
index 9f68587..9f68587 100644
--- a/share/icons/tango/actions/mail-message-new.svg
+++ b/apache/share/icons/tango/actions/mail-message-new.svg
diff --git a/share/icons/tango/actions/mail-reply-all.svg b/apache/share/icons/tango/actions/mail-reply-all.svg
index f1ee15f..f1ee15f 100644
--- a/share/icons/tango/actions/mail-reply-all.svg
+++ b/apache/share/icons/tango/actions/mail-reply-all.svg
diff --git a/share/icons/tango/actions/mail-reply-sender.svg b/apache/share/icons/tango/actions/mail-reply-sender.svg
index ad1cab4..ad1cab4 100644
--- a/share/icons/tango/actions/mail-reply-sender.svg
+++ b/apache/share/icons/tango/actions/mail-reply-sender.svg
diff --git a/share/icons/tango/actions/mail-send-receive.svg b/apache/share/icons/tango/actions/mail-send-receive.svg
index ef71577..ef71577 100644
--- a/share/icons/tango/actions/mail-send-receive.svg
+++ b/apache/share/icons/tango/actions/mail-send-receive.svg
diff --git a/share/icons/tango/actions/media-eject.svg b/apache/share/icons/tango/actions/media-eject.svg
index d22eae1..d22eae1 100644
--- a/share/icons/tango/actions/media-eject.svg
+++ b/apache/share/icons/tango/actions/media-eject.svg
diff --git a/share/icons/tango/actions/media-playback-pause.svg b/apache/share/icons/tango/actions/media-playback-pause.svg
index 8a434ca..8a434ca 100644
--- a/share/icons/tango/actions/media-playback-pause.svg
+++ b/apache/share/icons/tango/actions/media-playback-pause.svg
diff --git a/share/icons/tango/actions/media-playback-start.svg b/apache/share/icons/tango/actions/media-playback-start.svg
index 75616de..75616de 100644
--- a/share/icons/tango/actions/media-playback-start.svg
+++ b/apache/share/icons/tango/actions/media-playback-start.svg
diff --git a/share/icons/tango/actions/media-playback-stop.svg b/apache/share/icons/tango/actions/media-playback-stop.svg
index 24bbfb5..24bbfb5 100644
--- a/share/icons/tango/actions/media-playback-stop.svg
+++ b/apache/share/icons/tango/actions/media-playback-stop.svg
diff --git a/share/icons/tango/actions/media-record.svg b/apache/share/icons/tango/actions/media-record.svg
index 85bbb98..85bbb98 100644
--- a/share/icons/tango/actions/media-record.svg
+++ b/apache/share/icons/tango/actions/media-record.svg
diff --git a/share/icons/tango/actions/media-seek-backward.svg b/apache/share/icons/tango/actions/media-seek-backward.svg
index 75f49f1..75f49f1 100644
--- a/share/icons/tango/actions/media-seek-backward.svg
+++ b/apache/share/icons/tango/actions/media-seek-backward.svg
diff --git a/share/icons/tango/actions/media-seek-forward.svg b/apache/share/icons/tango/actions/media-seek-forward.svg
index b1b9fe9..b1b9fe9 100644
--- a/share/icons/tango/actions/media-seek-forward.svg
+++ b/apache/share/icons/tango/actions/media-seek-forward.svg
diff --git a/share/icons/tango/actions/media-skip-backward.svg b/apache/share/icons/tango/actions/media-skip-backward.svg
index fccd776..fccd776 100644
--- a/share/icons/tango/actions/media-skip-backward.svg
+++ b/apache/share/icons/tango/actions/media-skip-backward.svg
diff --git a/share/icons/tango/actions/media-skip-forward.svg b/apache/share/icons/tango/actions/media-skip-forward.svg
index 7c4d400..7c4d400 100644
--- a/share/icons/tango/actions/media-skip-forward.svg
+++ b/apache/share/icons/tango/actions/media-skip-forward.svg
diff --git a/share/icons/tango/actions/process-stop.svg b/apache/share/icons/tango/actions/process-stop.svg
index 04ce3a7..04ce3a7 100644
--- a/share/icons/tango/actions/process-stop.svg
+++ b/apache/share/icons/tango/actions/process-stop.svg
diff --git a/share/icons/tango/actions/system-lock-screen.svg b/apache/share/icons/tango/actions/system-lock-screen.svg
index e7d9f1b..e7d9f1b 100644
--- a/share/icons/tango/actions/system-lock-screen.svg
+++ b/apache/share/icons/tango/actions/system-lock-screen.svg
diff --git a/share/icons/tango/actions/system-log-out.svg b/apache/share/icons/tango/actions/system-log-out.svg
index adb9521..adb9521 100644
--- a/share/icons/tango/actions/system-log-out.svg
+++ b/apache/share/icons/tango/actions/system-log-out.svg
diff --git a/share/icons/tango/actions/system-search.svg b/apache/share/icons/tango/actions/system-search.svg
index 1a4c1cd..1a4c1cd 100644
--- a/share/icons/tango/actions/system-search.svg
+++ b/apache/share/icons/tango/actions/system-search.svg
diff --git a/share/icons/tango/actions/system-shutdown.svg b/apache/share/icons/tango/actions/system-shutdown.svg
index 9b0b327..9b0b327 100644
--- a/share/icons/tango/actions/system-shutdown.svg
+++ b/apache/share/icons/tango/actions/system-shutdown.svg
diff --git a/share/icons/tango/actions/tab-new.svg b/apache/share/icons/tango/actions/tab-new.svg
index f3c0a14..f3c0a14 100644
--- a/share/icons/tango/actions/tab-new.svg
+++ b/apache/share/icons/tango/actions/tab-new.svg
diff --git a/share/icons/tango/actions/view-fullscreen.svg b/apache/share/icons/tango/actions/view-fullscreen.svg
index d410654..d410654 100644
--- a/share/icons/tango/actions/view-fullscreen.svg
+++ b/apache/share/icons/tango/actions/view-fullscreen.svg
diff --git a/share/icons/tango/actions/view-refresh.svg b/apache/share/icons/tango/actions/view-refresh.svg
index 565f6da..565f6da 100644
--- a/share/icons/tango/actions/view-refresh.svg
+++ b/apache/share/icons/tango/actions/view-refresh.svg
diff --git a/share/icons/tango/actions/window-new.svg b/apache/share/icons/tango/actions/window-new.svg
index 60d33cf..60d33cf 100644
--- a/share/icons/tango/actions/window-new.svg
+++ b/apache/share/icons/tango/actions/window-new.svg
diff --git a/share/icons/tango/apps/accessories-calculator.svg b/apache/share/icons/tango/apps/accessories-calculator.svg
index 88cf76a..88cf76a 100644
--- a/share/icons/tango/apps/accessories-calculator.svg
+++ b/apache/share/icons/tango/apps/accessories-calculator.svg
diff --git a/share/icons/tango/apps/accessories-character-map.svg b/apache/share/icons/tango/apps/accessories-character-map.svg
index 8bb8dcf..8bb8dcf 100644
--- a/share/icons/tango/apps/accessories-character-map.svg
+++ b/apache/share/icons/tango/apps/accessories-character-map.svg
diff --git a/share/icons/tango/apps/accessories-text-editor.svg b/apache/share/icons/tango/apps/accessories-text-editor.svg
index 70621f0..70621f0 100644
--- a/share/icons/tango/apps/accessories-text-editor.svg
+++ b/apache/share/icons/tango/apps/accessories-text-editor.svg
diff --git a/share/icons/tango/apps/help-browser.svg b/apache/share/icons/tango/apps/help-browser.svg
index 851327f..851327f 100644
--- a/share/icons/tango/apps/help-browser.svg
+++ b/apache/share/icons/tango/apps/help-browser.svg
diff --git a/share/icons/tango/apps/internet-group-chat.svg b/apache/share/icons/tango/apps/internet-group-chat.svg
index 8e8945e..8e8945e 100644
--- a/share/icons/tango/apps/internet-group-chat.svg
+++ b/apache/share/icons/tango/apps/internet-group-chat.svg
diff --git a/share/icons/tango/apps/internet-mail.svg b/apache/share/icons/tango/apps/internet-mail.svg
index 8d5ea8c..8d5ea8c 100644
--- a/share/icons/tango/apps/internet-mail.svg
+++ b/apache/share/icons/tango/apps/internet-mail.svg
diff --git a/share/icons/tango/apps/internet-news-reader.svg b/apache/share/icons/tango/apps/internet-news-reader.svg
index b86f419..b86f419 100644
--- a/share/icons/tango/apps/internet-news-reader.svg
+++ b/apache/share/icons/tango/apps/internet-news-reader.svg
diff --git a/share/icons/tango/apps/internet-web-browser.svg b/apache/share/icons/tango/apps/internet-web-browser.svg
index d2366a9..d2366a9 100644
--- a/share/icons/tango/apps/internet-web-browser.svg
+++ b/apache/share/icons/tango/apps/internet-web-browser.svg
diff --git a/share/icons/tango/apps/office-calendar.svg b/apache/share/icons/tango/apps/office-calendar.svg
index d9f9281..d9f9281 100644
--- a/share/icons/tango/apps/office-calendar.svg
+++ b/apache/share/icons/tango/apps/office-calendar.svg
diff --git a/share/icons/tango/apps/preferences-desktop-accessibility.svg b/apache/share/icons/tango/apps/preferences-desktop-accessibility.svg
index 9977314..9977314 100644
--- a/share/icons/tango/apps/preferences-desktop-accessibility.svg
+++ b/apache/share/icons/tango/apps/preferences-desktop-accessibility.svg
diff --git a/share/icons/tango/apps/preferences-desktop-assistive-technology.svg b/apache/share/icons/tango/apps/preferences-desktop-assistive-technology.svg
index 39a4668..39a4668 100644
--- a/share/icons/tango/apps/preferences-desktop-assistive-technology.svg
+++ b/apache/share/icons/tango/apps/preferences-desktop-assistive-technology.svg
diff --git a/share/icons/tango/apps/preferences-desktop-font.svg b/apache/share/icons/tango/apps/preferences-desktop-font.svg
index 0793980..0793980 100644
--- a/share/icons/tango/apps/preferences-desktop-font.svg
+++ b/apache/share/icons/tango/apps/preferences-desktop-font.svg
diff --git a/share/icons/tango/apps/preferences-desktop-keyboard-shortcuts.svg b/apache/share/icons/tango/apps/preferences-desktop-keyboard-shortcuts.svg
index 6caf205..6caf205 100644
--- a/share/icons/tango/apps/preferences-desktop-keyboard-shortcuts.svg
+++ b/apache/share/icons/tango/apps/preferences-desktop-keyboard-shortcuts.svg
diff --git a/share/icons/tango/apps/preferences-desktop-locale.svg b/apache/share/icons/tango/apps/preferences-desktop-locale.svg
index 2e71f18..2e71f18 100644
--- a/share/icons/tango/apps/preferences-desktop-locale.svg
+++ b/apache/share/icons/tango/apps/preferences-desktop-locale.svg
diff --git a/share/icons/tango/apps/preferences-desktop-multimedia.svg b/apache/share/icons/tango/apps/preferences-desktop-multimedia.svg
index 9ddee90..9ddee90 100644
--- a/share/icons/tango/apps/preferences-desktop-multimedia.svg
+++ b/apache/share/icons/tango/apps/preferences-desktop-multimedia.svg
diff --git a/share/icons/tango/apps/preferences-desktop-remote-desktop.svg b/apache/share/icons/tango/apps/preferences-desktop-remote-desktop.svg
index 848e892..848e892 100644
--- a/share/icons/tango/apps/preferences-desktop-remote-desktop.svg
+++ b/apache/share/icons/tango/apps/preferences-desktop-remote-desktop.svg
diff --git a/share/icons/tango/apps/preferences-desktop-screensaver.svg b/apache/share/icons/tango/apps/preferences-desktop-screensaver.svg
index 0db4176..0db4176 100644
--- a/share/icons/tango/apps/preferences-desktop-screensaver.svg
+++ b/apache/share/icons/tango/apps/preferences-desktop-screensaver.svg
diff --git a/share/icons/tango/apps/preferences-desktop-theme.svg b/apache/share/icons/tango/apps/preferences-desktop-theme.svg
index 45ed886..45ed886 100644
--- a/share/icons/tango/apps/preferences-desktop-theme.svg
+++ b/apache/share/icons/tango/apps/preferences-desktop-theme.svg
diff --git a/share/icons/tango/apps/preferences-desktop-wallpaper.svg b/apache/share/icons/tango/apps/preferences-desktop-wallpaper.svg
index 0f94fbd..0f94fbd 100644
--- a/share/icons/tango/apps/preferences-desktop-wallpaper.svg
+++ b/apache/share/icons/tango/apps/preferences-desktop-wallpaper.svg
diff --git a/share/icons/tango/apps/preferences-system-network-proxy.svg b/apache/share/icons/tango/apps/preferences-system-network-proxy.svg
index efb2653..efb2653 100644
--- a/share/icons/tango/apps/preferences-system-network-proxy.svg
+++ b/apache/share/icons/tango/apps/preferences-system-network-proxy.svg
diff --git a/share/icons/tango/apps/preferences-system-session.svg b/apache/share/icons/tango/apps/preferences-system-session.svg
index 27954bc..27954bc 100644
--- a/share/icons/tango/apps/preferences-system-session.svg
+++ b/apache/share/icons/tango/apps/preferences-system-session.svg
diff --git a/share/icons/tango/apps/preferences-system-windows.svg b/apache/share/icons/tango/apps/preferences-system-windows.svg
index dc344f7..dc344f7 100644
--- a/share/icons/tango/apps/preferences-system-windows.svg
+++ b/apache/share/icons/tango/apps/preferences-system-windows.svg
diff --git a/share/icons/tango/apps/system-file-manager.svg b/apache/share/icons/tango/apps/system-file-manager.svg
index 99ad454..99ad454 100644
--- a/share/icons/tango/apps/system-file-manager.svg
+++ b/apache/share/icons/tango/apps/system-file-manager.svg
diff --git a/share/icons/tango/apps/system-installer.svg b/apache/share/icons/tango/apps/system-installer.svg
index 3200740..3200740 100644
--- a/share/icons/tango/apps/system-installer.svg
+++ b/apache/share/icons/tango/apps/system-installer.svg
diff --git a/share/icons/tango/apps/system-software-update.svg b/apache/share/icons/tango/apps/system-software-update.svg
index 66eb747..66eb747 100644
--- a/share/icons/tango/apps/system-software-update.svg
+++ b/apache/share/icons/tango/apps/system-software-update.svg
diff --git a/share/icons/tango/apps/system-users.svg b/apache/share/icons/tango/apps/system-users.svg
index 7d628b8..7d628b8 100644
--- a/share/icons/tango/apps/system-users.svg
+++ b/apache/share/icons/tango/apps/system-users.svg
diff --git a/share/icons/tango/apps/utilities-system-monitor.svg b/apache/share/icons/tango/apps/utilities-system-monitor.svg
index 8f4b946..8f4b946 100644
--- a/share/icons/tango/apps/utilities-system-monitor.svg
+++ b/apache/share/icons/tango/apps/utilities-system-monitor.svg
diff --git a/share/icons/tango/apps/utilities-terminal.svg b/apache/share/icons/tango/apps/utilities-terminal.svg
index 995fb90..995fb90 100644
--- a/share/icons/tango/apps/utilities-terminal.svg
+++ b/apache/share/icons/tango/apps/utilities-terminal.svg
diff --git a/share/icons/tango/categories/applications-accessories.svg b/apache/share/icons/tango/categories/applications-accessories.svg
index 35527cb..35527cb 100644
--- a/share/icons/tango/categories/applications-accessories.svg
+++ b/apache/share/icons/tango/categories/applications-accessories.svg
diff --git a/share/icons/tango/categories/applications-development.svg b/apache/share/icons/tango/categories/applications-development.svg
index f575528..f575528 100644
--- a/share/icons/tango/categories/applications-development.svg
+++ b/apache/share/icons/tango/categories/applications-development.svg
diff --git a/share/icons/tango/categories/applications-games.svg b/apache/share/icons/tango/categories/applications-games.svg
index 1d89e48..1d89e48 100644
--- a/share/icons/tango/categories/applications-games.svg
+++ b/apache/share/icons/tango/categories/applications-games.svg
diff --git a/share/icons/tango/categories/applications-graphics.svg b/apache/share/icons/tango/categories/applications-graphics.svg
index ec544d5..ec544d5 100644
--- a/share/icons/tango/categories/applications-graphics.svg
+++ b/apache/share/icons/tango/categories/applications-graphics.svg
diff --git a/share/icons/tango/categories/applications-internet.svg b/apache/share/icons/tango/categories/applications-internet.svg
index ebe3c60..ebe3c60 100644
--- a/share/icons/tango/categories/applications-internet.svg
+++ b/apache/share/icons/tango/categories/applications-internet.svg
diff --git a/share/icons/tango/categories/applications-multimedia.svg b/apache/share/icons/tango/categories/applications-multimedia.svg
index 6844e8d..6844e8d 100644
--- a/share/icons/tango/categories/applications-multimedia.svg
+++ b/apache/share/icons/tango/categories/applications-multimedia.svg
diff --git a/share/icons/tango/categories/applications-office.svg b/apache/share/icons/tango/categories/applications-office.svg
index e1b60b4..e1b60b4 100644
--- a/share/icons/tango/categories/applications-office.svg
+++ b/apache/share/icons/tango/categories/applications-office.svg
diff --git a/share/icons/tango/categories/applications-other.svg b/apache/share/icons/tango/categories/applications-other.svg
index 5e30c27..5e30c27 100644
--- a/share/icons/tango/categories/applications-other.svg
+++ b/apache/share/icons/tango/categories/applications-other.svg
diff --git a/share/icons/tango/categories/applications-system.svg b/apache/share/icons/tango/categories/applications-system.svg
index 9d76774..9d76774 100644
--- a/share/icons/tango/categories/applications-system.svg
+++ b/apache/share/icons/tango/categories/applications-system.svg
diff --git a/share/icons/tango/categories/preferences-desktop-peripherals.svg b/apache/share/icons/tango/categories/preferences-desktop-peripherals.svg
index 1e1663a..1e1663a 100644
--- a/share/icons/tango/categories/preferences-desktop-peripherals.svg
+++ b/apache/share/icons/tango/categories/preferences-desktop-peripherals.svg
diff --git a/share/icons/tango/categories/preferences-desktop.svg b/apache/share/icons/tango/categories/preferences-desktop.svg
index a0fd144..a0fd144 100644
--- a/share/icons/tango/categories/preferences-desktop.svg
+++ b/apache/share/icons/tango/categories/preferences-desktop.svg
diff --git a/share/icons/tango/categories/preferences-system.svg b/apache/share/icons/tango/categories/preferences-system.svg
index d41028f..d41028f 100644
--- a/share/icons/tango/categories/preferences-system.svg
+++ b/apache/share/icons/tango/categories/preferences-system.svg
diff --git a/share/icons/tango/devices/audio-card.svg b/apache/share/icons/tango/devices/audio-card.svg
index d7816a8..d7816a8 100644
--- a/share/icons/tango/devices/audio-card.svg
+++ b/apache/share/icons/tango/devices/audio-card.svg
diff --git a/share/icons/tango/devices/audio-input-microphone.svg b/apache/share/icons/tango/devices/audio-input-microphone.svg
index d31409c..d31409c 100644
--- a/share/icons/tango/devices/audio-input-microphone.svg
+++ b/apache/share/icons/tango/devices/audio-input-microphone.svg
diff --git a/share/icons/tango/devices/battery.svg b/apache/share/icons/tango/devices/battery.svg
index 30695dd..30695dd 100644
--- a/share/icons/tango/devices/battery.svg
+++ b/apache/share/icons/tango/devices/battery.svg
diff --git a/share/icons/tango/devices/camera-photo.svg b/apache/share/icons/tango/devices/camera-photo.svg
index 4911410..4911410 100644
--- a/share/icons/tango/devices/camera-photo.svg
+++ b/apache/share/icons/tango/devices/camera-photo.svg
diff --git a/share/icons/tango/devices/camera-video.svg b/apache/share/icons/tango/devices/camera-video.svg
index e247134..e247134 100644
--- a/share/icons/tango/devices/camera-video.svg
+++ b/apache/share/icons/tango/devices/camera-video.svg
diff --git a/share/icons/tango/devices/computer.svg b/apache/share/icons/tango/devices/computer.svg
index 4a63d5d..4a63d5d 100644
--- a/share/icons/tango/devices/computer.svg
+++ b/apache/share/icons/tango/devices/computer.svg
diff --git a/share/icons/tango/devices/drive-harddisk.svg b/apache/share/icons/tango/devices/drive-harddisk.svg
index 2d38ac6..2d38ac6 100644
--- a/share/icons/tango/devices/drive-harddisk.svg
+++ b/apache/share/icons/tango/devices/drive-harddisk.svg
diff --git a/share/icons/tango/devices/drive-optical.svg b/apache/share/icons/tango/devices/drive-optical.svg
index 644ef8a..644ef8a 100644
--- a/share/icons/tango/devices/drive-optical.svg
+++ b/apache/share/icons/tango/devices/drive-optical.svg
diff --git a/share/icons/tango/devices/drive-removable-media.svg b/apache/share/icons/tango/devices/drive-removable-media.svg
index 2b19874..2b19874 100644
--- a/share/icons/tango/devices/drive-removable-media.svg
+++ b/apache/share/icons/tango/devices/drive-removable-media.svg
diff --git a/share/icons/tango/devices/input-gaming.svg b/apache/share/icons/tango/devices/input-gaming.svg
index 5909a53..5909a53 100644
--- a/share/icons/tango/devices/input-gaming.svg
+++ b/apache/share/icons/tango/devices/input-gaming.svg
diff --git a/share/icons/tango/devices/input-keyboard.svg b/apache/share/icons/tango/devices/input-keyboard.svg
index 534dd38..534dd38 100644
--- a/share/icons/tango/devices/input-keyboard.svg
+++ b/apache/share/icons/tango/devices/input-keyboard.svg
diff --git a/share/icons/tango/devices/input-mouse.svg b/apache/share/icons/tango/devices/input-mouse.svg
index 2fda018..2fda018 100644
--- a/share/icons/tango/devices/input-mouse.svg
+++ b/apache/share/icons/tango/devices/input-mouse.svg
diff --git a/share/icons/tango/devices/media-flash.svg b/apache/share/icons/tango/devices/media-flash.svg
index 13f910f..13f910f 100644
--- a/share/icons/tango/devices/media-flash.svg
+++ b/apache/share/icons/tango/devices/media-flash.svg
diff --git a/share/icons/tango/devices/media-floppy.svg b/apache/share/icons/tango/devices/media-floppy.svg
index 6700163..6700163 100644
--- a/share/icons/tango/devices/media-floppy.svg
+++ b/apache/share/icons/tango/devices/media-floppy.svg
diff --git a/share/icons/tango/devices/media-optical.svg b/apache/share/icons/tango/devices/media-optical.svg
index 34aa13f..34aa13f 100644
--- a/share/icons/tango/devices/media-optical.svg
+++ b/apache/share/icons/tango/devices/media-optical.svg
diff --git a/share/icons/tango/devices/multimedia-player.svg b/apache/share/icons/tango/devices/multimedia-player.svg
index 01bf244..01bf244 100644
--- a/share/icons/tango/devices/multimedia-player.svg
+++ b/apache/share/icons/tango/devices/multimedia-player.svg
diff --git a/share/icons/tango/devices/network-wired.svg b/apache/share/icons/tango/devices/network-wired.svg
index bfa56d5..bfa56d5 100644
--- a/share/icons/tango/devices/network-wired.svg
+++ b/apache/share/icons/tango/devices/network-wired.svg
diff --git a/share/icons/tango/devices/network-wireless.svg b/apache/share/icons/tango/devices/network-wireless.svg
index e52d2bb..e52d2bb 100644
--- a/share/icons/tango/devices/network-wireless.svg
+++ b/apache/share/icons/tango/devices/network-wireless.svg
diff --git a/share/icons/tango/devices/printer.svg b/apache/share/icons/tango/devices/printer.svg
index 4c702dc..4c702dc 100644
--- a/share/icons/tango/devices/printer.svg
+++ b/apache/share/icons/tango/devices/printer.svg
diff --git a/share/icons/tango/devices/video-display.svg b/apache/share/icons/tango/devices/video-display.svg
index 26fe3a9..26fe3a9 100644
--- a/share/icons/tango/devices/video-display.svg
+++ b/apache/share/icons/tango/devices/video-display.svg
diff --git a/share/icons/tango/emblems/emblem-favorite.svg b/apache/share/icons/tango/emblems/emblem-favorite.svg
index f3fcbc2..f3fcbc2 100644
--- a/share/icons/tango/emblems/emblem-favorite.svg
+++ b/apache/share/icons/tango/emblems/emblem-favorite.svg
diff --git a/share/icons/tango/emblems/emblem-important.svg b/apache/share/icons/tango/emblems/emblem-important.svg
index 75bec8c..75bec8c 100644
--- a/share/icons/tango/emblems/emblem-important.svg
+++ b/apache/share/icons/tango/emblems/emblem-important.svg
diff --git a/share/icons/tango/emblems/emblem-photos.svg b/apache/share/icons/tango/emblems/emblem-photos.svg
index 3129efb..3129efb 100644
--- a/share/icons/tango/emblems/emblem-photos.svg
+++ b/apache/share/icons/tango/emblems/emblem-photos.svg
diff --git a/share/icons/tango/emblems/emblem-readonly.svg b/apache/share/icons/tango/emblems/emblem-readonly.svg
index 6a3e477..6a3e477 100644
--- a/share/icons/tango/emblems/emblem-readonly.svg
+++ b/apache/share/icons/tango/emblems/emblem-readonly.svg
diff --git a/share/icons/tango/emblems/emblem-symbolic-link.svg b/apache/share/icons/tango/emblems/emblem-symbolic-link.svg
index 45e040b..45e040b 100644
--- a/share/icons/tango/emblems/emblem-symbolic-link.svg
+++ b/apache/share/icons/tango/emblems/emblem-symbolic-link.svg
diff --git a/share/icons/tango/emblems/emblem-system.svg b/apache/share/icons/tango/emblems/emblem-system.svg
index 8bfdf70..8bfdf70 100644
--- a/share/icons/tango/emblems/emblem-system.svg
+++ b/apache/share/icons/tango/emblems/emblem-system.svg
diff --git a/share/icons/tango/emblems/emblem-unreadable.svg b/apache/share/icons/tango/emblems/emblem-unreadable.svg
index 282f64e..282f64e 100644
--- a/share/icons/tango/emblems/emblem-unreadable.svg
+++ b/apache/share/icons/tango/emblems/emblem-unreadable.svg
diff --git a/share/icons/tango/emotes/face-angel.svg b/apache/share/icons/tango/emotes/face-angel.svg
index 84ac543..84ac543 100644
--- a/share/icons/tango/emotes/face-angel.svg
+++ b/apache/share/icons/tango/emotes/face-angel.svg
diff --git a/share/icons/tango/emotes/face-crying.svg b/apache/share/icons/tango/emotes/face-crying.svg
index 16118d8..16118d8 100644
--- a/share/icons/tango/emotes/face-crying.svg
+++ b/apache/share/icons/tango/emotes/face-crying.svg
diff --git a/share/icons/tango/emotes/face-devilish.svg b/apache/share/icons/tango/emotes/face-devilish.svg
index e4846a3..e4846a3 100644
--- a/share/icons/tango/emotes/face-devilish.svg
+++ b/apache/share/icons/tango/emotes/face-devilish.svg
diff --git a/share/icons/tango/emotes/face-glasses.svg b/apache/share/icons/tango/emotes/face-glasses.svg
index dc8641c..dc8641c 100644
--- a/share/icons/tango/emotes/face-glasses.svg
+++ b/apache/share/icons/tango/emotes/face-glasses.svg
diff --git a/share/icons/tango/emotes/face-grin.svg b/apache/share/icons/tango/emotes/face-grin.svg
index 26046e3..26046e3 100644
--- a/share/icons/tango/emotes/face-grin.svg
+++ b/apache/share/icons/tango/emotes/face-grin.svg
diff --git a/share/icons/tango/emotes/face-kiss.svg b/apache/share/icons/tango/emotes/face-kiss.svg
index 9f4318a..9f4318a 100644
--- a/share/icons/tango/emotes/face-kiss.svg
+++ b/apache/share/icons/tango/emotes/face-kiss.svg
diff --git a/share/icons/tango/emotes/face-monkey.svg b/apache/share/icons/tango/emotes/face-monkey.svg
index 8412f30..8412f30 100644
--- a/share/icons/tango/emotes/face-monkey.svg
+++ b/apache/share/icons/tango/emotes/face-monkey.svg
diff --git a/share/icons/tango/emotes/face-plain.svg b/apache/share/icons/tango/emotes/face-plain.svg
index 5860974..5860974 100644
--- a/share/icons/tango/emotes/face-plain.svg
+++ b/apache/share/icons/tango/emotes/face-plain.svg
diff --git a/share/icons/tango/emotes/face-sad.svg b/apache/share/icons/tango/emotes/face-sad.svg
index fdfa02d..fdfa02d 100644
--- a/share/icons/tango/emotes/face-sad.svg
+++ b/apache/share/icons/tango/emotes/face-sad.svg
diff --git a/share/icons/tango/emotes/face-smile-big.svg b/apache/share/icons/tango/emotes/face-smile-big.svg
index e0fbd57..e0fbd57 100644
--- a/share/icons/tango/emotes/face-smile-big.svg
+++ b/apache/share/icons/tango/emotes/face-smile-big.svg
diff --git a/share/icons/tango/emotes/face-smile.svg b/apache/share/icons/tango/emotes/face-smile.svg
index 4528ba0..4528ba0 100644
--- a/share/icons/tango/emotes/face-smile.svg
+++ b/apache/share/icons/tango/emotes/face-smile.svg
diff --git a/share/icons/tango/emotes/face-surprise.svg b/apache/share/icons/tango/emotes/face-surprise.svg
index b40a301..b40a301 100644
--- a/share/icons/tango/emotes/face-surprise.svg
+++ b/apache/share/icons/tango/emotes/face-surprise.svg
diff --git a/share/icons/tango/emotes/face-wink.svg b/apache/share/icons/tango/emotes/face-wink.svg
index 54ac00b..54ac00b 100644
--- a/share/icons/tango/emotes/face-wink.svg
+++ b/apache/share/icons/tango/emotes/face-wink.svg
diff --git a/share/icons/tango/mimetypes/application-certificate.svg b/apache/share/icons/tango/mimetypes/application-certificate.svg
index 077f741..077f741 100644
--- a/share/icons/tango/mimetypes/application-certificate.svg
+++ b/apache/share/icons/tango/mimetypes/application-certificate.svg
diff --git a/share/icons/tango/mimetypes/application-x-executable.svg b/apache/share/icons/tango/mimetypes/application-x-executable.svg
index 38088df..38088df 100644
--- a/share/icons/tango/mimetypes/application-x-executable.svg
+++ b/apache/share/icons/tango/mimetypes/application-x-executable.svg
diff --git a/share/icons/tango/mimetypes/audio-x-generic.svg b/apache/share/icons/tango/mimetypes/audio-x-generic.svg
index be2d18a..be2d18a 100644
--- a/share/icons/tango/mimetypes/audio-x-generic.svg
+++ b/apache/share/icons/tango/mimetypes/audio-x-generic.svg
diff --git a/share/icons/tango/mimetypes/font-x-generic.svg b/apache/share/icons/tango/mimetypes/font-x-generic.svg
index b489775..b489775 100644
--- a/share/icons/tango/mimetypes/font-x-generic.svg
+++ b/apache/share/icons/tango/mimetypes/font-x-generic.svg
diff --git a/share/icons/tango/mimetypes/image-x-generic.svg b/apache/share/icons/tango/mimetypes/image-x-generic.svg
index 45dd641..45dd641 100644
--- a/share/icons/tango/mimetypes/image-x-generic.svg
+++ b/apache/share/icons/tango/mimetypes/image-x-generic.svg
diff --git a/share/icons/tango/mimetypes/package-x-generic.svg b/apache/share/icons/tango/mimetypes/package-x-generic.svg
index 47beed7..47beed7 100644
--- a/share/icons/tango/mimetypes/package-x-generic.svg
+++ b/apache/share/icons/tango/mimetypes/package-x-generic.svg
diff --git a/share/icons/tango/mimetypes/text-html.svg b/apache/share/icons/tango/mimetypes/text-html.svg
index 330c390..330c390 100644
--- a/share/icons/tango/mimetypes/text-html.svg
+++ b/apache/share/icons/tango/mimetypes/text-html.svg
diff --git a/share/icons/tango/mimetypes/text-x-generic-template.svg b/apache/share/icons/tango/mimetypes/text-x-generic-template.svg
index f70eda4..f70eda4 100644
--- a/share/icons/tango/mimetypes/text-x-generic-template.svg
+++ b/apache/share/icons/tango/mimetypes/text-x-generic-template.svg
diff --git a/share/icons/tango/mimetypes/text-x-generic.svg b/apache/share/icons/tango/mimetypes/text-x-generic.svg
index 532f98b..532f98b 100644
--- a/share/icons/tango/mimetypes/text-x-generic.svg
+++ b/apache/share/icons/tango/mimetypes/text-x-generic.svg
diff --git a/share/icons/tango/mimetypes/text-x-script.svg b/apache/share/icons/tango/mimetypes/text-x-script.svg
index 65db6c5..65db6c5 100644
--- a/share/icons/tango/mimetypes/text-x-script.svg
+++ b/apache/share/icons/tango/mimetypes/text-x-script.svg
diff --git a/share/icons/tango/mimetypes/video-x-generic.svg b/apache/share/icons/tango/mimetypes/video-x-generic.svg
index 1f3a8b9..1f3a8b9 100644
--- a/share/icons/tango/mimetypes/video-x-generic.svg
+++ b/apache/share/icons/tango/mimetypes/video-x-generic.svg
diff --git a/share/icons/tango/mimetypes/x-office-address-book.svg b/apache/share/icons/tango/mimetypes/x-office-address-book.svg
index 55ddaa3..55ddaa3 100644
--- a/share/icons/tango/mimetypes/x-office-address-book.svg
+++ b/apache/share/icons/tango/mimetypes/x-office-address-book.svg
diff --git a/share/icons/tango/mimetypes/x-office-calendar.svg b/apache/share/icons/tango/mimetypes/x-office-calendar.svg
index 5f1159b..5f1159b 100644
--- a/share/icons/tango/mimetypes/x-office-calendar.svg
+++ b/apache/share/icons/tango/mimetypes/x-office-calendar.svg
diff --git a/share/icons/tango/mimetypes/x-office-document-template.svg b/apache/share/icons/tango/mimetypes/x-office-document-template.svg
index 421c16b..421c16b 100644
--- a/share/icons/tango/mimetypes/x-office-document-template.svg
+++ b/apache/share/icons/tango/mimetypes/x-office-document-template.svg
diff --git a/share/icons/tango/mimetypes/x-office-document.svg b/apache/share/icons/tango/mimetypes/x-office-document.svg
index b3c5d96..b3c5d96 100644
--- a/share/icons/tango/mimetypes/x-office-document.svg
+++ b/apache/share/icons/tango/mimetypes/x-office-document.svg
diff --git a/share/icons/tango/mimetypes/x-office-drawing-template.svg b/apache/share/icons/tango/mimetypes/x-office-drawing-template.svg
index 5a48428..5a48428 100644
--- a/share/icons/tango/mimetypes/x-office-drawing-template.svg
+++ b/apache/share/icons/tango/mimetypes/x-office-drawing-template.svg
diff --git a/share/icons/tango/mimetypes/x-office-drawing.svg b/apache/share/icons/tango/mimetypes/x-office-drawing.svg
index 5fd0804..5fd0804 100644
--- a/share/icons/tango/mimetypes/x-office-drawing.svg
+++ b/apache/share/icons/tango/mimetypes/x-office-drawing.svg
diff --git a/share/icons/tango/mimetypes/x-office-presentation-template.svg b/apache/share/icons/tango/mimetypes/x-office-presentation-template.svg
index 8e0bff4..8e0bff4 100644
--- a/share/icons/tango/mimetypes/x-office-presentation-template.svg
+++ b/apache/share/icons/tango/mimetypes/x-office-presentation-template.svg
diff --git a/share/icons/tango/mimetypes/x-office-presentation.svg b/apache/share/icons/tango/mimetypes/x-office-presentation.svg
index 179e0e4..179e0e4 100644
--- a/share/icons/tango/mimetypes/x-office-presentation.svg
+++ b/apache/share/icons/tango/mimetypes/x-office-presentation.svg
diff --git a/share/icons/tango/mimetypes/x-office-spreadsheet-template.svg b/apache/share/icons/tango/mimetypes/x-office-spreadsheet-template.svg
index 0c3ca9b..0c3ca9b 100644
--- a/share/icons/tango/mimetypes/x-office-spreadsheet-template.svg
+++ b/apache/share/icons/tango/mimetypes/x-office-spreadsheet-template.svg
diff --git a/share/icons/tango/mimetypes/x-office-spreadsheet.svg b/apache/share/icons/tango/mimetypes/x-office-spreadsheet.svg
index cbc4df2..cbc4df2 100644
--- a/share/icons/tango/mimetypes/x-office-spreadsheet.svg
+++ b/apache/share/icons/tango/mimetypes/x-office-spreadsheet.svg
diff --git a/share/icons/tango/places/folder-remote.svg b/apache/share/icons/tango/places/folder-remote.svg
index dc7d3a3..dc7d3a3 100644
--- a/share/icons/tango/places/folder-remote.svg
+++ b/apache/share/icons/tango/places/folder-remote.svg
diff --git a/share/icons/tango/places/folder-saved-search.svg b/apache/share/icons/tango/places/folder-saved-search.svg
index 58e1f88..58e1f88 100644
--- a/share/icons/tango/places/folder-saved-search.svg
+++ b/apache/share/icons/tango/places/folder-saved-search.svg
diff --git a/share/icons/tango/places/folder.svg b/apache/share/icons/tango/places/folder.svg
index 79b25c3..79b25c3 100644
--- a/share/icons/tango/places/folder.svg
+++ b/apache/share/icons/tango/places/folder.svg
diff --git a/share/icons/tango/places/network-server.svg b/apache/share/icons/tango/places/network-server.svg
index 3587d2b..3587d2b 100644
--- a/share/icons/tango/places/network-server.svg
+++ b/apache/share/icons/tango/places/network-server.svg
diff --git a/share/icons/tango/places/network-workgroup.svg b/apache/share/icons/tango/places/network-workgroup.svg
index 52f6205..52f6205 100644
--- a/share/icons/tango/places/network-workgroup.svg
+++ b/apache/share/icons/tango/places/network-workgroup.svg
diff --git a/share/icons/tango/places/start-here.svg b/apache/share/icons/tango/places/start-here.svg
index 3f53130..3f53130 100644
--- a/share/icons/tango/places/start-here.svg
+++ b/apache/share/icons/tango/places/start-here.svg
diff --git a/share/icons/tango/places/user-desktop.svg b/apache/share/icons/tango/places/user-desktop.svg
index 75749a0..75749a0 100644
--- a/share/icons/tango/places/user-desktop.svg
+++ b/apache/share/icons/tango/places/user-desktop.svg
diff --git a/share/icons/tango/places/user-home.svg b/apache/share/icons/tango/places/user-home.svg
index b2c83d1..b2c83d1 100644
--- a/share/icons/tango/places/user-home.svg
+++ b/apache/share/icons/tango/places/user-home.svg
diff --git a/share/icons/tango/places/user-trash.svg b/apache/share/icons/tango/places/user-trash.svg
index c2d6f25..c2d6f25 100644
--- a/share/icons/tango/places/user-trash.svg
+++ b/apache/share/icons/tango/places/user-trash.svg
diff --git a/share/icons/tango/status/audio-volume-high.svg b/apache/share/icons/tango/status/audio-volume-high.svg
index 0d8e47a..0d8e47a 100644
--- a/share/icons/tango/status/audio-volume-high.svg
+++ b/apache/share/icons/tango/status/audio-volume-high.svg
diff --git a/share/icons/tango/status/audio-volume-low.svg b/apache/share/icons/tango/status/audio-volume-low.svg
index 208b1bb..208b1bb 100644
--- a/share/icons/tango/status/audio-volume-low.svg
+++ b/apache/share/icons/tango/status/audio-volume-low.svg
diff --git a/share/icons/tango/status/audio-volume-medium.svg b/apache/share/icons/tango/status/audio-volume-medium.svg
index e3c0bb9..e3c0bb9 100644
--- a/share/icons/tango/status/audio-volume-medium.svg
+++ b/apache/share/icons/tango/status/audio-volume-medium.svg
diff --git a/share/icons/tango/status/audio-volume-muted.svg b/apache/share/icons/tango/status/audio-volume-muted.svg
index 976fd5e..976fd5e 100644
--- a/share/icons/tango/status/audio-volume-muted.svg
+++ b/apache/share/icons/tango/status/audio-volume-muted.svg
diff --git a/share/icons/tango/status/battery-caution.svg b/apache/share/icons/tango/status/battery-caution.svg
index 2581963..2581963 100644
--- a/share/icons/tango/status/battery-caution.svg
+++ b/apache/share/icons/tango/status/battery-caution.svg
diff --git a/share/icons/tango/status/dialog-error.svg b/apache/share/icons/tango/status/dialog-error.svg
index 6dfc2de..6dfc2de 100644
--- a/share/icons/tango/status/dialog-error.svg
+++ b/apache/share/icons/tango/status/dialog-error.svg
diff --git a/share/icons/tango/status/dialog-information.svg b/apache/share/icons/tango/status/dialog-information.svg
index 922b316..922b316 100644
--- a/share/icons/tango/status/dialog-information.svg
+++ b/apache/share/icons/tango/status/dialog-information.svg
diff --git a/share/icons/tango/status/dialog-warning.svg b/apache/share/icons/tango/status/dialog-warning.svg
index e09ecca..e09ecca 100644
--- a/share/icons/tango/status/dialog-warning.svg
+++ b/apache/share/icons/tango/status/dialog-warning.svg
diff --git a/share/icons/tango/status/folder-drag-accept.svg b/apache/share/icons/tango/status/folder-drag-accept.svg
index 734feb2..734feb2 100644
--- a/share/icons/tango/status/folder-drag-accept.svg
+++ b/apache/share/icons/tango/status/folder-drag-accept.svg
diff --git a/share/icons/tango/status/folder-open.svg b/apache/share/icons/tango/status/folder-open.svg
index 237f6f2..237f6f2 100644
--- a/share/icons/tango/status/folder-open.svg
+++ b/apache/share/icons/tango/status/folder-open.svg
diff --git a/share/icons/tango/status/folder-visiting.svg b/apache/share/icons/tango/status/folder-visiting.svg
index f8bac9d..f8bac9d 100644
--- a/share/icons/tango/status/folder-visiting.svg
+++ b/apache/share/icons/tango/status/folder-visiting.svg
diff --git a/share/icons/tango/status/image-loading.svg b/apache/share/icons/tango/status/image-loading.svg
index 0fdf252..0fdf252 100644
--- a/share/icons/tango/status/image-loading.svg
+++ b/apache/share/icons/tango/status/image-loading.svg
diff --git a/share/icons/tango/status/image-missing.svg b/apache/share/icons/tango/status/image-missing.svg
index 8b7f491..8b7f491 100644
--- a/share/icons/tango/status/image-missing.svg
+++ b/apache/share/icons/tango/status/image-missing.svg
diff --git a/share/icons/tango/status/mail-attachment.svg b/apache/share/icons/tango/status/mail-attachment.svg
index 4c7f5f6..4c7f5f6 100644
--- a/share/icons/tango/status/mail-attachment.svg
+++ b/apache/share/icons/tango/status/mail-attachment.svg
diff --git a/share/icons/tango/status/network-error.svg b/apache/share/icons/tango/status/network-error.svg
index 9ec7ca5..9ec7ca5 100644
--- a/share/icons/tango/status/network-error.svg
+++ b/apache/share/icons/tango/status/network-error.svg
diff --git a/share/icons/tango/status/network-idle.svg b/apache/share/icons/tango/status/network-idle.svg
index 8201ad2..8201ad2 100644
--- a/share/icons/tango/status/network-idle.svg
+++ b/apache/share/icons/tango/status/network-idle.svg
diff --git a/share/icons/tango/status/network-offline.svg b/apache/share/icons/tango/status/network-offline.svg
index d34ba27..d34ba27 100644
--- a/share/icons/tango/status/network-offline.svg
+++ b/apache/share/icons/tango/status/network-offline.svg
diff --git a/share/icons/tango/status/network-receive.svg b/apache/share/icons/tango/status/network-receive.svg
index 01ed0fa..01ed0fa 100644
--- a/share/icons/tango/status/network-receive.svg
+++ b/apache/share/icons/tango/status/network-receive.svg
diff --git a/share/icons/tango/status/network-transmit-receive.svg b/apache/share/icons/tango/status/network-transmit-receive.svg
index 504e07b..504e07b 100644
--- a/share/icons/tango/status/network-transmit-receive.svg
+++ b/apache/share/icons/tango/status/network-transmit-receive.svg
diff --git a/share/icons/tango/status/network-transmit.svg b/apache/share/icons/tango/status/network-transmit.svg
index a984f21..a984f21 100644
--- a/share/icons/tango/status/network-transmit.svg
+++ b/apache/share/icons/tango/status/network-transmit.svg
diff --git a/share/icons/tango/status/network-wireless-encrypted.svg b/apache/share/icons/tango/status/network-wireless-encrypted.svg
index 623a0a6..623a0a6 100644
--- a/share/icons/tango/status/network-wireless-encrypted.svg
+++ b/apache/share/icons/tango/status/network-wireless-encrypted.svg
diff --git a/share/icons/tango/status/printer-error.svg b/apache/share/icons/tango/status/printer-error.svg
index 14209f7..14209f7 100644
--- a/share/icons/tango/status/printer-error.svg
+++ b/apache/share/icons/tango/status/printer-error.svg
diff --git a/share/icons/tango/status/software-update-available.svg b/apache/share/icons/tango/status/software-update-available.svg
index 9a5a688..9a5a688 100644
--- a/share/icons/tango/status/software-update-available.svg
+++ b/apache/share/icons/tango/status/software-update-available.svg
diff --git a/share/icons/tango/status/software-update-urgent.svg b/apache/share/icons/tango/status/software-update-urgent.svg
index 168a67c..168a67c 100644
--- a/share/icons/tango/status/software-update-urgent.svg
+++ b/apache/share/icons/tango/status/software-update-urgent.svg
diff --git a/share/icons/tango/status/user-trash-full.svg b/apache/share/icons/tango/status/user-trash-full.svg
index 393285f..393285f 100644
--- a/share/icons/tango/status/user-trash-full.svg
+++ b/apache/share/icons/tango/status/user-trash-full.svg
diff --git a/share/icons/tango/status/weather-clear-night.svg b/apache/share/icons/tango/status/weather-clear-night.svg
index 5737f25..5737f25 100644
--- a/share/icons/tango/status/weather-clear-night.svg
+++ b/apache/share/icons/tango/status/weather-clear-night.svg
diff --git a/share/icons/tango/status/weather-clear.svg b/apache/share/icons/tango/status/weather-clear.svg
index 6a74ec8..6a74ec8 100644
--- a/share/icons/tango/status/weather-clear.svg
+++ b/apache/share/icons/tango/status/weather-clear.svg
diff --git a/share/icons/tango/status/weather-few-clouds-night.svg b/apache/share/icons/tango/status/weather-few-clouds-night.svg
index 52a0aab..52a0aab 100644
--- a/share/icons/tango/status/weather-few-clouds-night.svg
+++ b/apache/share/icons/tango/status/weather-few-clouds-night.svg
diff --git a/share/icons/tango/status/weather-few-clouds.svg b/apache/share/icons/tango/status/weather-few-clouds.svg
index 57d45e9..57d45e9 100644
--- a/share/icons/tango/status/weather-few-clouds.svg
+++ b/apache/share/icons/tango/status/weather-few-clouds.svg
diff --git a/share/icons/tango/status/weather-overcast.svg b/apache/share/icons/tango/status/weather-overcast.svg
index 35fb4a4..35fb4a4 100644
--- a/share/icons/tango/status/weather-overcast.svg
+++ b/apache/share/icons/tango/status/weather-overcast.svg
diff --git a/share/icons/tango/status/weather-severe-alert.svg b/apache/share/icons/tango/status/weather-severe-alert.svg
index bdae678..bdae678 100644
--- a/share/icons/tango/status/weather-severe-alert.svg
+++ b/apache/share/icons/tango/status/weather-severe-alert.svg
diff --git a/share/icons/tango/status/weather-showers-scattered.svg b/apache/share/icons/tango/status/weather-showers-scattered.svg
index 5a3ae32..5a3ae32 100644
--- a/share/icons/tango/status/weather-showers-scattered.svg
+++ b/apache/share/icons/tango/status/weather-showers-scattered.svg
diff --git a/share/icons/tango/status/weather-showers.svg b/apache/share/icons/tango/status/weather-showers.svg
index c814571..c814571 100644
--- a/share/icons/tango/status/weather-showers.svg
+++ b/apache/share/icons/tango/status/weather-showers.svg
diff --git a/share/icons/tango/status/weather-snow.svg b/apache/share/icons/tango/status/weather-snow.svg
index 6c7b4ad..6c7b4ad 100644
--- a/share/icons/tango/status/weather-snow.svg
+++ b/apache/share/icons/tango/status/weather-snow.svg
diff --git a/share/icons/tango/status/weather-storm.svg b/apache/share/icons/tango/status/weather-storm.svg
index 4d8bfec..4d8bfec 100644
--- a/share/icons/tango/status/weather-storm.svg
+++ b/apache/share/icons/tango/status/weather-storm.svg
diff --git a/share/man/Makefile b/apache/share/man/Makefile
index 2fe75b5..ff27677 100644
--- a/share/man/Makefile
+++ b/apache/share/man/Makefile
@@ -1,4 +1,6 @@
-# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Open Infrastructure: service-tools
+
+# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -13,30 +15,45 @@
 # 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 <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# Depends: python3-docutils
 
-# Depends: asciidoc dblatex docbook-xsl libxml2-utils source-highlight
+RST2MAN = rst2man \
+	--no-datestamp \
+	--no-generator \
+	--strict \
+	--strip-comments \
+	--tab-width=4 \
+	--verbose
 
-A2X = a2x \
-	--asciidoc-opts "-a revdate=$(shell cat ../../VERSION.txt)" \
-	--doctype=manpage
+VERSION := $(shell cat ../../../VERSION.txt)
 
 SHELL := sh -e
 
 all: build
 
-clean:
-	rm -f *.[0-9]
-	rm -f *.xml
-
 build: man
 
 rebuild: clean build
 
-man: *.txt
-	for FILE in *.txt; \
+man: man.in *.rst
+	@echo -n "Creating manpages... "
+
+	@for FILE in *.rst; \
 	do \
-		$(A2X) --format=manpage $${FILE}; \
+		cp man.in $$(basename $${FILE} .rst); \
+		$(RST2MAN) $${FILE} | \
+		sed	-e '/^.\\" Man page generated/d' \
+			-e '/^.\\" Generated by/d' \
+			-e "s|^\(.TH .*\) \(\"\" \"\"\) |\1 $${VERSION} service-tools |" \
+		>> $$(basename $${FILE} .rst); \
+		echo -n "."; \
 	done
 
+	@echo " done."
+
+clean:
+	rm -f *.[0-9]
+
 .PHONY: all clean build rebuild man
diff --git a/apache/share/man/man.in b/apache/share/man/man.in
new file mode 100644
index 0000000..b7acdb7
--- /dev/null
+++ b/apache/share/man/man.in
@@ -0,0 +1,19 @@
+.\" Open Infrastructure: service-tools
+.\"
+.\" Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+.\"
+.\" SPDX-License-Identifier: GPL-3.0+
+.\"
+.\" 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 3 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/>.
+.\"
diff --git a/apache/share/man/service-tools.7.rst b/apache/share/man/service-tools.7.rst
new file mode 100644
index 0000000..63f0258
--- /dev/null
+++ b/apache/share/man/service-tools.7.rst
@@ -0,0 +1,124 @@
+.. Open Infrastructure: apache-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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 3 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/>.
+
+============
+apache-tools
+============
+
+----------------------------------
+Extra tools for Apache HTTP server
+----------------------------------
+
+:manual section: 7
+:manual group: Open Infrastructure
+
+Description
+===========
+
+This package is a collection of extra tools for the Apache HTTP server,
+currently containing:
+
+  * alternative icons for Apache autoindex
+    (Tango Icons and Font Awesome based themes)
+
+Download
+========
+
+| Upstream Releases:
+| https://get.open-infrastructure.net/software/service-tools/upstream
+
+| Upstream Sources:
+| https://git.open-infrastructure.net/software/service-tools
+
+| Debian Releases:
+| https://get.open-infrastructure.net/software/service-tools/debian
+
+| Debian Sources:
+| https://git.progress-linux.org/users/daniel/debian/packages/open-infrastructure-service-tools
+
+Installation
+============
+
+Source
+------
+
+| $ sudo apt install git make python3-docutils
+| $ git clone https://git.open-infrastructure.net/software/service-tools
+| $ cd service-tools/apache && sudo make install
+
+Debian 9 (stretch) and newer
+----------------------------
+
+| $ sudo apt install apache-tools
+
+Development
+===========
+
+Bug reports, feature requests, help, patches, support and everything else are
+welcome on the Open Infrastructure Software Mailing List
+(https://lists.open-infrastructure.net/listinfo/software).
+
+Please base patches against the 'next' Git branch using common sense
+(https://www.kernel.org/doc/Documentation/SubmittingPatches).
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System
+(https://bugs.debian.org).
+
+Known limitations
+=================
+
+Changing from one icon set to the other requires a reload of the apache webserver.
+
+Usage
+=====
+
+The default icon theme is determined by the /usr/share/apache-icons/default
+(and /usr/share/apache-icons/default.conf respectivly) file.
+
+On Debian based system "sudo update-alternatives --config apache-icons" can be
+used to automatically select the active icon theme (including the default apache
+icons).
+
+The following themes are available:
+
+  * awesome-png: Fork Awesome based, PNG format
+  * awesome-svg: Fork Awesome based, SVG format
+  * tango-png: Tango Icons based, PNG format
+  * tango-svg: Tango Icons based, SVG format
+
+The SVG themes are preferable because they are sharper and scale losless.
+Very old browser can not render SVG icons, use PNG if that is a concern.
+
+An example of the tango-svg theme can be seen on
+https://get.open-infrastructure.net.
+
+Links
+=====
+
+| * Fork Awesome
+|   (https://forkaweso.me)
+
+| * Tango Desktop Project
+|   (http://tango.freedesktop.org)
+
+Authors
+=======
+
+service-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/maps/awesome.txt b/apache/share/maps/awesome.txt
index 5730c17..5730c17 100644
--- a/share/maps/awesome.txt
+++ b/apache/share/maps/awesome.txt
diff --git a/share/maps/tango.txt b/apache/share/maps/tango.txt
index 4dae761..4dae761 100644
--- a/share/maps/tango.txt
+++ b/apache/share/maps/tango.txt
diff --git a/dehydrated/Makefile b/dehydrated/Makefile
new file mode 100644
index 0000000..0c9da96
--- /dev/null
+++ b/dehydrated/Makefile
@@ -0,0 +1,118 @@
+# Open Infrastructure: service-tools
+
+# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# SPDX-License-Identifier: GPL-3.0+
+#
+# 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 3 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/>.
+
+SHELL := sh -e
+
+SCRIPTS = bin/* share/hooks/*
+
+all: build
+
+test:
+	@echo -n "Checking for syntax errors with sh... "
+	@for SCRIPT in $(SCRIPTS); \
+	do \
+		sh -n $${SCRIPT}; \
+		echo -n "."; \
+	done
+	@echo " done."
+
+	@echo -n "Checking for bashisms... "
+	@if [ -x /usr/bin/checkbashisms ]; \
+	then \
+		for SCRIPT in $(SCRIPTS); \
+		do \
+			checkbashisms -f -x $${SCRIPT}; \
+			echo -n "."; \
+		done; \
+	else \
+		echo "Note: devscripts not installed, skipping checkbashisms."; \
+	fi
+	@echo " done."
+
+	@echo -n "Checking with shellcheck... "
+	@if [ -x /usr/bin/shellcheck ]; \
+	then \
+		for SCRIPT in $(SCRIPTS); \
+		do \
+			shellcheck -e SC2039 $${SCRIPT}; \
+			echo -n "."; \
+		done; \
+	else \
+		echo "Note: shellcheck not installed, skipping shellcheck."; \
+	fi
+	@echo " done."
+
+build:
+
+install: build
+	mkdir -p $(DESTDIR)/etc/dehydrated/hook.d
+
+	mkdir -p $(DESTDIR)/etc/cron.d
+	cp -r share/cron/* $(DESTDIR)/etc/cron.d
+
+	mkdir -p $(DESTDIR)/etc/cron.daily
+	ln -s /usr/bin/dehydrated-cron $(DESTDIR)/etc/cron.daily/dehydrated
+
+	mkdir -p $(DESTDIR)/etc/logrotate.d
+	cp -r share/logrotate/* $(DESTDIR)/etc/logrotate.d
+
+	mkdir -p $(DESTDIR)/usr/bin
+	cp -r bin/* $(DESTDIR)/usr/bin
+
+	mkdir -p $(DESTDIR)/usr/share/dehydrated/hooks
+	cp -r share/hooks/* $(DESTDIR)/usr/share/dehydrated/hooks
+
+	ln -sf /usr/bin/dehydrated-nsupdate $(DESTDIR)/usr/share/dehydrated/hooks/clean_challenge.nsupdate
+	ln -sf /usr/bin/dehydrated-nsupdate $(DESTDIR)/usr/share/dehydrated/hooks/deploy_challenge.nsupdate
+
+uninstall:
+	rm -rf $(DESTDIR)/usr/share/dehydrated/hooks
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/dehydrated || true
+
+	for FILE in bin/*; \
+	do \
+		rm -f $(DESTDIR)/usr/bin/$$(basename $${FILE}); \
+	done
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/bin || true
+
+	for FILE in share/logrotate/*; \
+	do \
+		rm -f $(DESTDIR)/etc/logrotate.d/$$(basename $${FILE}); \
+	done
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/logrotate.d || true
+
+	rm -f $(DESTDIR)/etc/cron.daily/dehydrated
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/cron.daily || true
+
+	for FILE in share/cron/*; \
+	do \
+		rm -f $(DESTDIR)/etc/cron.d/$$(basename $${FILE}); \
+	done
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/cron.d || true
+
+	rm -rf $(DESTDIR)/etc/dehydrated/hook.d
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/dehydrated || true
+
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR) || true
+
+clean:
+
+distclean:
+
+reinstall: uninstall install
diff --git a/dehydrated/bin/dehydrated-cron b/dehydrated/bin/dehydrated-cron
new file mode 100755
index 0000000..09e1a44
--- /dev/null
+++ b/dehydrated/bin/dehydrated-cron
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+mkdir -p /var/log/dehydrated
+dehydrated -gcd >> /var/log/dehydrated/dehydrated.log
+chown -R root:adm /var/log/dehydrated
diff --git a/dehydrated/bin/dehydrated-hook.d b/dehydrated/bin/dehydrated-hook.d
new file mode 100755
index 0000000..2d9a5af
--- /dev/null
+++ b/dehydrated/bin/dehydrated-hook.d
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+set -e
+
+HOOKS="/etc/dehydrated/hook.d"
+
+deploy_challenge ()
+{
+	export DOMAIN="${1}" TOKEN_FILENAME="${2}" TOKEN_VALUE="${3}"
+
+	run-parts --regex '^deploy_challenge.*' "${HOOKS}"
+}
+
+clean_challenge ()
+{
+	export DOMAIN="${1}" TOKEN_FILENAME="${2}" TOKEN_VALUE="${3}"
+
+	run-parts --regex '^clean_challenge.*' "${HOOKS}"
+}
+
+sync_cert ()
+{
+	export KEYFILE="${1}" CERTFILE="${2}" FULLCHAINFILE="${3}" CHAINFILE="${4}" REQUESTFILE="${5}"
+
+	run-parts --regex '^sync_cert.*' "${HOOKS}"
+}
+
+deploy_cert ()
+{
+	export DOMAIN="${1}" KEYFILE="${2}" CERTFILE="${3}" FULLCHAINFILE="${4}" CHAINFILE="${5}" TIMESTAMP="${6}"
+
+	run-parts --regex '^deploy_cert.*' "${HOOKS}"
+}
+
+deploy_ocsp ()
+{
+	export DOMAIN="${1}" OCSPFILE="${2}" TIMESTAMP="${3}"
+
+	run-parts --regex '^deploy_ocsp.*' "${HOOKS}"
+}
+
+unchanged_cert ()
+{
+	export DOMAIN="${1}" KEYFILE="${2}" CERTFILE="${3}" FULLCHAINFILE="${4}" CHAINFILE="${5}"
+
+	run-parts --regex '^unchanged_cert.*' "${HOOKS}"
+}
+
+invalid_challenge ()
+{
+	export DOMAIN="${1}" RESPONSE="${2}"
+
+	run-parts --regex '^invalid_challenge.*' "${HOOKS}"
+}
+
+request_failure ()
+{
+	export STATUSCODE="${1}" REASON="${2}" REQTYPE="${3}" HEADERS="${4}"
+
+	run-parts --regex '^request_failure.*' "${HOOKS}"
+}
+
+generate_csr ()
+{
+	export DOMAIN="${1}" CERTDIR="${2}" ALTNAMES="${3}"
+
+	run-parts --regex '^generate_csr.*' "${HOOKS}"
+}
+
+startup_hook ()
+{
+	run-parts --regex '^startup_hook.*' "${HOOKS}"
+}
+
+exit_hook ()
+{
+	export ERROR="${1:-}"
+
+	run-parts --regex '^exit_hook.*' "${HOOKS}"
+}
+
+HANDLER="${1}"
+
+if [ -z "${HANDLER}" ]
+then
+	echo "Usage: ${0} HANDLER" >&2
+	exit 1
+fi
+
+shift
+
+case "${HANDLER}" in
+	deploy_challenge|clean_challenge|sync_cert|deploy_cert|deploy_ocsp|unchanged_cert|invalid_challenge|request_failure|generate_csr|startup_hook|exit_hook)
+		"${HANDLER}" "${@}"
+		;;
+esac
diff --git a/dehydrated/bin/dehydrated-nsupdate b/dehydrated/bin/dehydrated-nsupdate
new file mode 100755
index 0000000..f901d2e
--- /dev/null
+++ b/dehydrated/bin/dehydrated-nsupdate
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+set -e
+
+HOOK="$(basename "${0}")"
+HOOK_ACTION="$(echo "${HOOK}" | awk -F. '{ print $1 }')"
+
+# set nsupdate action
+case "${HOOK}" in
+	clean_challenge.*)
+		HOOK_ACTION="delete"
+		;;
+
+	deploy_challenge.*)
+		HOOK_ACTION="add"
+		;;
+
+	*)
+		echo "'${HOOK}': no such hook action '${HOOK_ACTION}'" >&2
+		echo "'${HOOK}': use 'clean_challenge.' or 'deploy_challenge.' as prefix in your symlink" >&2
+		exit 1
+		;;
+esac
+
+# alternatives handling for dig
+if command -v kdig > /dev/null 2>&1
+then
+	# knot-dnsutils
+	DIG="kdig"
+elif command -v dig > /dev/null 2>&1
+then
+	# bind-dnsutils
+	DIG="dig"
+else
+	echo "'${HOOK}': need dig from bind-dnsutils or knot-dnsutils" >&2
+	exit 1
+fi
+
+# alternatives handling for nsupdate
+if command -v knsupdate > /dev/null 2>&1
+then
+	# knot-dnsutils
+	NSUPDATE="knsupdate"
+elif command -v nsupdate > /dev/null 2>&1
+then
+	# bind-dnsutils
+	NSUPDATE="nsupdate"
+else
+	echo "'${HOOK}': need nsupdate from bind-dnsutils or knot-dnsutils" >&2
+	exit 1
+fi
+
+# find txt record to update
+CNAME="$(${DIG} "_acme-challenge.${DOMAIN}" 2>&1 | awk '/CNAME/ { print $5 }' | tail -n1)"
+
+if [ -n "${CNAME}" ]
+then
+	UPDATE_DOMAIN="${CNAME}"
+else
+	UPDATE_DOMAIN="_acme-challenge.${DOMAIN}"
+fi
+
+# find nameservers to update
+ZONE="${UPDATE_DOMAIN}"
+
+while true
+do
+	NAMESERVERS="$(${DIG} NS "${ZONE}" 2>&1 | awk '/NS/ { print $5 }' | tail -n1)"
+
+	if [ -n "${NAMESERVERS}" ]
+	then
+		break
+	else
+		ZONE="$(echo "${ZONE}" | cut -d '.' -f 2-)"
+	fi
+done
+
+NAMESERVERS="$(${DIG} +short NS "${ZONE}")"
+
+# update nameservers
+for NAMESERVER in ${NAMESERVERS}
+do
+	echo -n " + Adding TXT record (${UPDATE_DOMAIN})..."
+
+echo "server ${NAMESERVER}
+zone ${ZONE}
+ttl 0
+update ${HOOK_ACTION} ${UPDATE_DOMAIN} 0 TXT ${TOKEN_VALUE}
+send" | "${NSUPDATE}"
+
+	echo " done."
+done
diff --git a/dehydrated/share/cron/dehydrated b/dehydrated/share/cron/dehydrated
new file mode 100755
index 0000000..bece74f
--- /dev/null
+++ b/dehydrated/share/cron/dehydrated
@@ -0,0 +1,3 @@
+# /etc/cron.d/dehydrated
+
+@reboot	root	/usr/bin/dehydrated-cron
diff --git a/dehydrated/share/hooks/deploy_cert.fullchain-privkey b/dehydrated/share/hooks/deploy_cert.fullchain-privkey
new file mode 100755
index 0000000..5457036
--- /dev/null
+++ b/dehydrated/share/hooks/deploy_cert.fullchain-privkey
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+DIRECTORY="$(dirname "${FULLCHAINFILE}")"
+FILE="cert.fullchain-privkey-${TIMESTAMP}.pem"
+
+cat "${FULLCHAINFILE}" "${KEYFILE}" > "${DIRECTORY}/${FILE}"
+ln -sf "${FILE}" "${DIRECTORY}/cert.fullchain-privkey.pem"
diff --git a/dehydrated/share/hooks/deploy_ocsp.fullchain-privkey b/dehydrated/share/hooks/deploy_ocsp.fullchain-privkey
new file mode 100755
index 0000000..e68716b
--- /dev/null
+++ b/dehydrated/share/hooks/deploy_ocsp.fullchain-privkey
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+FILE="$(readlink "${OCSPFILE}")"
+DIRECTORY="$(dirname "${OCSPFILE}")"
+
+ln -sf "${FILE}" "${DIRECTORY}/cert.fullchain-privkey.pem.ocsp"
diff --git a/dehydrated/share/hooks/exit_hook.fix-permissions b/dehydrated/share/hooks/exit_hook.fix-permissions
new file mode 100755
index 0000000..c5bb646
--- /dev/null
+++ b/dehydrated/share/hooks/exit_hook.fix-permissions
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+echo " + Fixing permissions..."
+
+if getent group ssl-cert > /dev/null 2>&1
+then
+	echo -n "   + /var/lib/dehydrated/certs:"
+
+	find /var/lib/dehydrated/certs -type d -exec chmod 0750 {} \;
+	find /var/lib/dehydrated/certs -type f -exec chmod 0640 {} \;
+
+	# https://bugs.debian.org/854431
+	chown -R root:ssl-cert /var/lib/dehydrated/certs
+
+	echo " done."
+fi
diff --git a/dehydrated/share/hooks/exit_hook.service-reload b/dehydrated/share/hooks/exit_hook.service-reload
new file mode 100755
index 0000000..2da8c1b
--- /dev/null
+++ b/dehydrated/share/hooks/exit_hook.service-reload
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+echo " + Reloading services..."
+
+for SERVICE in apache2 haproxy postgresql redis-server
+do
+	if service ${SERVICE} status > /dev/null 2>&1
+	then
+		echo -n "   + ${SERVICE}:"
+
+		service ${SERVICE} reload || service ${SERVICE} restart
+
+		echo " done."
+	fi
+done
diff --git a/dehydrated/share/logrotate/dehydrated b/dehydrated/share/logrotate/dehydrated
new file mode 100644
index 0000000..385a4aa
--- /dev/null
+++ b/dehydrated/share/logrotate/dehydrated
@@ -0,0 +1,13 @@
+# /etc/logrotate.d/dehydrated
+
+/var/log/dehydrated/dehydrated.log {
+	compress
+	create 0640 root adm
+	dateext
+	dateformat -%Y%m
+	dateyesterday
+	missingok
+	monthly
+	notifempty
+	rotate 12
+}
diff --git a/git/Makefile b/git/Makefile
new file mode 100644
index 0000000..cbc112e
--- /dev/null
+++ b/git/Makefile
@@ -0,0 +1,89 @@
+# Open Infrastructure: service-tools
+
+# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# SPDX-License-Identifier: GPL-3.0+
+#
+# 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 3 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/>.
+
+SHELL := sh -e
+
+SCRIPTS = bin/* share/hooks/* share/hooks/*/*
+
+all: build
+
+test:
+	@echo -n "Checking for syntax errors with sh... "
+	@for SCRIPT in $(SCRIPTS); \
+	do \
+		sh -n $${SCRIPT}; \
+		echo -n "."; \
+	done
+	@echo " done."
+
+	@echo -n "Checking for bashisms... "
+	@if [ -x /usr/bin/checkbashisms ]; \
+	then \
+		for SCRIPT in $(SCRIPTS); \
+		do \
+			checkbashisms -f -x $${SCRIPT}; \
+			echo -n "."; \
+		done; \
+	else \
+		echo "Note: devscripts not installed, skipping checkbashisms."; \
+	fi
+	@echo " done."
+
+	@echo -n "Checking with shellcheck... "
+	@if [ -x /usr/bin/shellcheck ]; \
+	then \
+		for SCRIPT in $(SCRIPTS); \
+		do \
+			if [ ! -d $${SCRIPT} ]; \
+			then \
+				shellcheck -e SC2039 $${SCRIPT} || true; \
+				echo -n "."; \
+			fi; \
+		done; \
+	else \
+		echo "Note: shellcheck not installed, skipping shellcheck."; \
+	fi
+	@echo " done."
+
+build:
+
+install: build
+	mkdir -p $(DESTDIR)/usr/bin
+	cp -r bin/* $(DESTDIR)/usr/bin
+
+	mkdir -p $(DESTDIR)/usr/share/dehydrated/hooks
+	cp -r share/hooks/* $(DESTDIR)/usr/share/dehydrated/hooks
+
+uninstall:
+	rm -rf $(DESTDIR)/usr/share/git/hooks
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/git || true
+
+	for FILE in bin/*; \
+	do \
+		rm -f $(DESTDIR)/usr/bin/$$(basename $${FILE}); \
+	done
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/bin || true
+
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR) || true
+
+clean:
+
+distclean:
+
+reinstall: uninstall install
diff --git a/git/bin/git-checkout-branches b/git/bin/git-checkout-branches
new file mode 100755
index 0000000..5b1ef15
--- /dev/null
+++ b/git/bin/git-checkout-branches
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+CURRENT_BRANCH="$(git branch --show-current)"
+REMOTE_BRANCHES="$(git branch -r | awk '{ print $1 }')"
+
+for REMOTE_BRANCH in ${REMOTE_BRANCHES}
+do
+	BRANCH="$(echo "${REMOTE_BRANCH}" | cut -d/ -f 2-)"
+
+	case "${BRANCH}" in
+		HEAD)
+			continue
+			;;
+	esac
+
+	if git branch | grep -Eq "^ *${BRANCH}$"
+	then
+		continue
+	fi
+
+	git checkout -b "${BRANCH}" "${REMOTE_BRANCH}"
+done
+
+if [ "$(git branch --show-current)" != "${CURRENT_BRANCH}" ]
+then
+	git checkout "${CURRENT_BRANCH}"
+fi
diff --git a/git/bin/git-hook.d b/git/bin/git-hook.d
new file mode 100755
index 0000000..1c0ab10
--- /dev/null
+++ b/git/bin/git-hook.d
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+HOOKS="${0}.d"
+
+for HOOK in "${HOOKS}"/*
+do
+	if [ -x "${HOOK}" ]
+	then
+		"${HOOK}" "${@}" || true
+	fi
+done
diff --git a/git/bin/git-remove-origin-branches b/git/bin/git-remove-origin-branches
new file mode 100755
index 0000000..f2b580f
--- /dev/null
+++ b/git/bin/git-remove-origin-branches
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+BRANCHES="${*}"
+
+for BRANCH in ${BRANCHES}
+do
+	git push origin :"${BRANCH}"
+done
diff --git a/git/bin/git-remove-origin-tags b/git/bin/git-remove-origin-tags
new file mode 100755
index 0000000..bcbf192
--- /dev/null
+++ b/git/bin/git-remove-origin-tags
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+TAGS="${*}"
+
+for TAG in ${TAGS}
+do
+	git push origin :refs/tags/"${TAG}"
+done
diff --git a/git/bin/git-repo-repack b/git/bin/git-repo-repack
new file mode 100755
index 0000000..d9d7357
--- /dev/null
+++ b/git/bin/git-repo-repack
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+	--quiet)
+		QUIET="true"
+		shift
+
+		GIT_REPACK_OPTIONS="-q"
+		GIT_GC_OPTIONS="--quiet"
+		;;
+esac
+
+REPOSITORIES="${*}"
+
+if [ -z "${REPOSITORIES}" ]
+then
+	if [ ! -e HEAD ]
+	then
+		REPOSITORIES="*.git"
+	else
+		REPOSITORIES="$(pwd)"
+	fi
+fi
+
+for REPOSITORY in ${REPOSITORIES}
+do
+	[ "${QUIET}" ] || echo "================================================================================"
+	[ "${QUIET}" ] || echo "${REPOSITORY}"
+	[ "${QUIET}" ] || echo "================================================================================"
+
+	cd "${REPOSITORY}"
+	git repack "${GIT_REPACK_OPTIONS}" -a -b -d -f -F
+	git gc "${GIT_GC_OPTIONS}" --aggressive --prune
+	cd "${OLDPWD}"
+
+	if [ "$(id -u)" -eq "0" ]
+	then
+		USER_ID="$(stat -c %u "${REPOSITORY}")"
+		GROUP_ID="$(stat -c %g "${REPOSITORY}")"
+
+		chown "${USER_ID}":"${GROUP_ID}" "${REPOSITORY}" -R
+	fi
+done
diff --git a/git/bin/git-whoami b/git/bin/git-whoami
new file mode 100755
index 0000000..9cab9bc
--- /dev/null
+++ b/git/bin/git-whoami
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# git-whoami
+# Author: Peter Eisentraut <peter@eisentraut.org>
+# Created: 2011-10-27
+# License: WTFPL; see http://sam.zoy.org/wtfpl/
+
+# exact logic in ident.c in git source tree
+
+set -e
+
+get_email() {
+	git config user.email || ( [ -n "$EMAIL" ] && echo "$EMAIL" ) || echo "$(id -nu)@$(hostname --fqdn)"
+}
+
+get_name() {
+	git config user.name || getent passwd $(id -un) | cut -d : -f 5 | cut -d , -f 1
+}
+
+: ${GIT_AUTHOR_NAME=$(get_name)}
+: ${GIT_COMMITTER_NAME=$(get_name)}
+: ${GIT_AUTHOR_EMAIL=$(get_email)}
+: ${GIT_COMMITTER_EMAIL=$(get_email)}
+
+author="$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>"
+commit="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
+
+if [ "$author" = "$commit" ]; then
+	echo "$author"
+else
+	echo "Author: $author"
+	echo "Commit: $commit"
+fi
diff --git a/git/share/hooks/post-update.d/cgit-agefile b/git/share/hooks/post-update.d/cgit-agefile
new file mode 100755
index 0000000..cf95745
--- /dev/null
+++ b/git/share/hooks/post-update.d/cgit-agefile
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+agefile="$(git rev-parse --git-dir)"/info/web/last-modified
+
+mkdir -p "$(dirname "$agefile")"
+git for-each-ref --sort=-authordate --count=1 --format='%(authordate:iso8601)' >"$agefile"
diff --git a/git/share/hooks/post-update.d/git-update-server-info b/git/share/hooks/post-update.d/git-update-server-info
new file mode 100755
index 0000000..fba9845
--- /dev/null
+++ b/git/share/hooks/post-update.d/git-update-server-info
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+git update-server-info
diff --git a/git/share/hooks/post-update.d/irker-notification b/git/share/hooks/post-update.d/irker-notification
new file mode 100755
index 0000000..212cc6c
--- /dev/null
+++ b/git/share/hooks/post-update.d/irker-notification
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ -z "$(git config --get irker.project)" ]
+then
+	exit 0
+fi
+
+echo "sending IRC notification"
+
+while read OLD NEW REFNAME
+do
+	irkerhook --refname=${REFNAME} $(git rev-list --reverse ${OLD}..${NEW})
+done
diff --git a/irker/Makefile b/irker/Makefile
new file mode 100644
index 0000000..6521bce
--- /dev/null
+++ b/irker/Makefile
@@ -0,0 +1,83 @@
+# Open Infrastructure: service-tools
+
+# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# SPDX-License-Identifier: GPL-3.0+
+#
+# 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 3 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/>.
+
+SHELL := sh -e
+
+SCRIPTS = bin/*
+
+all: build
+
+test:
+	@echo -n "Checking for syntax errors with sh... "
+	@for SCRIPT in $(SCRIPTS); \
+	do \
+		sh -n $${SCRIPT}; \
+		echo -n "."; \
+	done
+	@echo " done."
+
+	@echo -n "Checking for bashisms... "
+	@if [ -x /usr/bin/checkbashisms ]; \
+	then \
+		for SCRIPT in $(SCRIPTS); \
+		do \
+			checkbashisms -f -x $${SCRIPT}; \
+			echo -n "."; \
+		done; \
+	else \
+		echo "Note: devscripts not installed, skipping checkbashisms."; \
+	fi
+	@echo " done."
+
+	@echo -n "Checking with shellcheck... "
+	@if [ -x /usr/bin/shellcheck ]; \
+	then \
+		for SCRIPT in $(SCRIPTS); \
+		do \
+			if [ ! -d $${SCRIPT} ]; \
+			then \
+				shellcheck -e SC1090 -e SC2039 $${SCRIPT} || true; \
+				echo -n "."; \
+			fi; \
+		done; \
+	else \
+		echo "Note: shellcheck not installed, skipping shellcheck."; \
+	fi
+	@echo " done."
+
+build:
+
+install: build
+	mkdir -p $(DESTDIR)/usr/bin
+	cp -r bin/* $(DESTDIR)/usr/bin
+
+uninstall:
+	for FILE in bin/*; \
+	do \
+		rm -f $(DESTDIR)/usr/bin/$$(basename $${FILE}); \
+	done
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/bin || true
+
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR) || true
+
+clean:
+
+distclean:
+
+reinstall: uninstall install
diff --git a/irker/bin/irkerhook-debian b/irker/bin/irkerhook-debian
new file mode 100755
index 0000000..bd9e160
--- /dev/null
+++ b/irker/bin/irkerhook-debian
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+MESSAGE="${*}"
+
+PROGRAM="$(basename "${0}")"
+
+for FILE in "/etc/default/${PROGRAM}" "/etc/default/${PROGRAM}.d"/*
+do
+	if [ -e "${FILE}" ]
+	then
+		. "${FILE}" || true
+	fi
+done
+
+if [ "${IRK_ENABLED}" != "true" ]
+then
+	exit 0
+fi
+
+echo "sending IRC notification"
+
+for IRC_CHANNEL in ${IRC_CHANNELS}
+do
+	irk "${IRC_CHANNEL}" "${MESSAGE}"
+done
diff --git a/knot-resolver/Makefile b/knot-resolver/Makefile
new file mode 100644
index 0000000..3a2e4b9
--- /dev/null
+++ b/knot-resolver/Makefile
@@ -0,0 +1,80 @@
+# Open Infrastructure: service-tools
+
+# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# SPDX-License-Identifier: GPL-3.0+
+#
+# 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 3 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/>.
+
+SHELL := sh -e
+
+SCRIPTS = bin/*
+
+all: build
+
+test:
+	@echo -n "Checking for syntax errors with sh... "
+	@for SCRIPT in $(SCRIPTS); \
+	do \
+		sh -n $${SCRIPT}; \
+		echo -n "."; \
+	done
+	@echo " done."
+
+	@echo -n "Checking for bashisms... "
+	@if [ -x /usr/bin/checkbashisms ]; \
+	then \
+		for SCRIPT in $(SCRIPTS); \
+		do \
+			checkbashisms -f -x $${SCRIPT}; \
+			echo -n "."; \
+		done; \
+	else \
+		echo "Note: devscripts not installed, skipping checkbashisms."; \
+	fi
+	@echo " done."
+
+	@echo -n "Checking with shellcheck... "
+	@if [ -x /usr/bin/shellcheck ]; \
+	then \
+		for SCRIPT in $(SCRIPTS); \
+		do \
+			shellcheck -e SC2039 $${SCRIPT}; \
+			echo -n "."; \
+		done; \
+	else \
+		echo "Note: shellcheck not installed, skipping shellcheck."; \
+	fi
+	@echo " done."
+
+build:
+
+install: build
+	mkdir -p $(DESTDIR)/usr/bin
+	cp -r bin/* $(DESTDIR)/usr/bin
+
+uninstall:
+	for FILE in bin/*; \
+	do \
+		rm -f $(DESTDIR)/usr/bin/$$(basename $${FILE}); \
+	done
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/bin || true
+
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR) || true
+
+clean:
+
+distclean:
+
+reinstall: uninstall install
diff --git a/knot-resolver/bin/kresd-cache-clear b/knot-resolver/bin/kresd-cache-clear
new file mode 100755
index 0000000..5eadee0
--- /dev/null
+++ b/knot-resolver/bin/kresd-cache-clear
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+set -e
+
+HOSTS="${*}"
+
+if [ -z "${HOSTS}" ]
+then
+	echo "Usage: ${0} localhost|[HOST1 HOST2 ...]" >&2
+	exit 1
+fi
+
+for HOST in ${HOSTS}
+do
+	case "${HOST}" in
+		localhost)
+			NUMBER="$(systemctl | grep -c 'kresd@[0-9].service')"
+
+			for NUMBER in $(seq 1 "${NUMBER}")
+			do
+				echo "Flushing localhost, resolver ${NUMBER}"
+				echo "cache.clear()" | sudo socat - UNIX-CONNECT:/run/knot-resolver/control/"${NUMBER}"
+			done
+			;;
+
+		*)
+			NUMBER="$(ssh "${HOST}" sudo systemctl | grep -c 'kresd@[0-9].service')"
+
+			for NUMBER in $(seq 1 "${NUMBER}")
+			do
+				echo "Flushing ${HOST}, resolver ${NUMBER}"
+				echo "cache.clear()" | ssh "${HOST}" sudo socat - UNIX-CONNECT:/run/knot-resolver/control/"${NUMBER}"
+			done
+			;;
+	esac
+done
+
+echo
diff --git a/share/man/service-tools.7.txt b/share/man/service-tools.7.txt
deleted file mode 100644
index 01cec5f..0000000
--- a/share/man/service-tools.7.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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 3 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 <http://www.gnu.org/licenses/>.
-
-APACHE-ICONS(7)
-===============
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: service-tools
-:man version: {revnumber}
-
-
-NAME
-----
-apache-icons - Alternative icons for Apache autoindex
-
-
-DESCRIPTION
------------
-"The Apache HTTP Server is the world's most used web server software."
-    -- Wikipedia (https://en.wikipedia.org/wiki/Apache_HTTP_Server)
-
-apache-icons provides alternative icons for Apache autoindex.
-
-
-DOWNLOAD
---------
-  * Upstream Releases: https://get.open-infrastructure.net/software/service-tools/upstream
-  * Upstream Sources: https://git.open-infrastructure.net/software/service-tools
-  * Debian Releases: https://get.open-infrastructure.net/software/service-tools/debian
-  * Debian Sources: https://git.progress-linux.org/users/daniel.baumann/debian/packages/open-infrastructure-service-tools
-
-
-INSTALLATION
-------------
-
-SOURCE
-~~~~~~
-  1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc imagemagick librsvg2-bin
-  2. git clone https://git.open-infrastructure.net/software/service-tools
-  3. cd service-tools && sudo make install
-
-DEBIAN 9 (STRETCH) AND NEWER
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  * sudo apt install apache-icons
-
-DEBIAN 10 (BUSTER) AND NEWER
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  * sudo apt install apache-tools
-
-
-DEVELOPMENT
------------
-Bug reports, feature requests, help, patches, support and everything else
-are welcome on the Open Infrastructure Software Mailing List:
-
-  * https://lists.open-infrastructure.net/listinfo/software
-
-Please base patches against the 'next' Git branch using common sense:
-
-  * https://www.kernel.org/doc/Documentation/SubmittingPatches
-
-Debian specific bugs can also be reported in the Debian Bug Tracking System:
-
-  * https://bugs.debian.org
-
-
-KNOWN LIMITATIONS
------------------
-Changing from one icon set to the other requires a reload of the apache webserver.
-
-
-USAGE
------
-The default icon theme is determined by the /usr/share/apache-icons/default
-(and /usr/share/apache-icons/default.conf respectivly) file.
-
-On Debian based system "sudo update-alternatives --config apache-icons" can be
-used to automatically select the active icon theme (including the default apache
-icons).
-
-The following themes are available:
-
-  * awesome-png: Fork Awesome based, PNG format
-  * awesome-svg: Fork Awesome based, SVG format
-  * tango-png: Tango Icons based, PNG format
-  * tango-svg: Tango Icons based, SVG format
-
-The SVG themes are preferable because they are sharper and scale losless.
-They require somewhat modern browsers though.
-
-An example of the tango-svg theme can be seen on
-https://get.open-infrastructure.net.
-
-
-LINKS
------
-*Fork Awesome:*::
-	https://https://forkaweso.me
-
-*Tango Desktop Project:*::
-	http://tango.freedesktop.org/
-
-
-AUTHORS
--------
-  * Daniel Baumann <daniel.baumann@open-infrastructure.net>