Recent changes to this wiki:

Use git.sigxcpu.org to clone repos
the git service on honk is disabled since ages.
diff --git a/development/sigxcpu.org_git_repositories.mdwn b/development/sigxcpu.org_git_repositories.mdwn
index 2816d7a..7082fce 100644
--- a/development/sigxcpu.org_git_repositories.mdwn
+++ b/development/sigxcpu.org_git_repositories.mdwn
@@ -4,8 +4,8 @@ sigxcpu.org's GIT repositories are located at:
 
 You can clone them by running:
 
-    git clone git://honk.sigxcpu.org/git/$REPO
+    git clone https://git.sigxcpu.org/cgit/$REPO
 
 e.g.:
 
-    git clone git://honk.sigxcpu.org/git/git-buildpackage.git
+    git clone https://git.sigxcpu.org/cgit/git-buildpackage

Add links
diff --git a/agx.mdwn b/agx.mdwn
index 7b8d211..3419a61 100644
--- a/agx.mdwn
+++ b/agx.mdwn
@@ -1,10 +1,10 @@
 [Guido Günther](/con/) <<agx@sigxcpu.org>>
 
-* GPG Key-ID: 0xB999CDB58C8DDBD2, Fingerprint: D343 9DAA 19DC FACD AE87  9CF2 B999 CDB5 8C8D DBD2
+* GPG Key-ID: [0xB999CDB58C8DDBD2](https://honk.sigxcpu.org/misc/agx@sigxcpu.org.gpg), Fingerprint: D343 9DAA 19DC FACD AE87  9CF2 B999 CDB5 8C8D DBD2
 * Jabber/XMPP: agx@sigxcpu.org
 * List of [[Publications]] (talks, papers, etc.)
 * [Blog](http://honk.sigxcpu.org/con)
 * [Microblog/Twitter](https://twitter.com/GuidoGuenther)
 * [Ohloh](http://www.ohloh.net/accounts/agx)
 * [github](http://github.com/agx)
-* [Bitcoin](https://blockchain.info/address/125iKXeVzLJCfb4R9x4gMhshs5FPrgfVry)
+* Bitcoin: [125iKXeVzLJCfb4R9x4gMhshs5FPrgfVry](https://blockchain.info/address/125iKXeVzLJCfb4R9x4gMhshs5FPrgfVry)

Add bitcoin address
diff --git a/agx.mdwn b/agx.mdwn
index 0df4e5c..7b8d211 100644
--- a/agx.mdwn
+++ b/agx.mdwn
@@ -7,3 +7,4 @@
 * [Microblog/Twitter](https://twitter.com/GuidoGuenther)
 * [Ohloh](http://www.ohloh.net/accounts/agx)
 * [github](http://github.com/agx)
+* [Bitcoin](https://blockchain.info/address/125iKXeVzLJCfb4R9x4gMhshs5FPrgfVry)

Update GPG key
diff --git a/agx.mdwn b/agx.mdwn
index ad78c65..0df4e5c 100644
--- a/agx.mdwn
+++ b/agx.mdwn
@@ -1,7 +1,7 @@
 [Guido Günther](/con/) <<agx@sigxcpu.org>>
 
-* GPG Key-ID: 3F3E6426, Fingerprint: FBDF 66F8 4CAC 5E58 8EC4  77E4 9FCF 2CCD 3F3E 6426
-* Jabber: agx@sigxcpu.org
+* GPG Key-ID: 0xB999CDB58C8DDBD2, Fingerprint: D343 9DAA 19DC FACD AE87  9CF2 B999 CDB5 8C8D DBD2
+* Jabber/XMPP: agx@sigxcpu.org
 * List of [[Publications]] (talks, papers, etc.)
 * [Blog](http://honk.sigxcpu.org/con)
 * [Microblog/Twitter](https://twitter.com/GuidoGuenther)

More qemu debugging
diff --git a/development/qemu-debugging.mdwn b/development/qemu-debugging.mdwn
index 44a8a7c..ed30a17 100644
--- a/development/qemu-debugging.mdwn
+++ b/development/qemu-debugging.mdwn
@@ -14,14 +14,20 @@ output goes to /var/log/libvirt/qemu/<vm>.log by default
             <target dir='ltstest'/>
         </filesystem>
 
-*mapped* is important. It uses extended attributes so it needs user_xattr on the host filesystem.
+*mapped* is important. It uses extended attributes so the filesystem that
+needs to be mounted with *user_xattr* on the host filesystem and the folder
+needs to be writeable by qemu:
 
-Guests fstab:
+        mount -o remount,user_xattr /cache/ltstest
+        chown libvirt-qemu /cache/ltstest
+
+The Guests fstab then uses:
 
     ltstest /ltstest 9p   trans=virtio,version=9p2000.L,rw 0 0
 
-Do
+After mounting you can write from the guest to the hosts fileystem:
 
+    mount /ltstest
     cd /ltstest && touch a
 
 results on the host as extended attributes
@@ -61,3 +67,10 @@ via QMP monitor:
 * List all devices:
 
         qemu-system-x86_64 -device ?
+
+* Enabling the monitor on raw qemu
+
+        $ qemu-system-i386 -qmp tcp:localhost:4444,server,nowait
+		$ telnet localhost 4444
+		{ "execute": "qmp_capabilities" }
+		{"execute": "commands"}

Mention pypi
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index fc15a45..8856051 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -27,13 +27,20 @@ There are some helpers in */usr/share/doc/git-buildpackage/examples/*:
 The usage of the *GitRepository* class is shown (and tested) in
 [test_GitRepository](http://honk.sigxcpu.org/projects/git-buildpackage/apidocs/tests.test_GitRepository-module.html).
 
+## Download
 
 [[!template  id=honk_git repo="git-buildpackage"]]
 
 There's also a clone on [github](https://github.com/agx/git-buildpackage).
 
-## Debian packages
-Debian packages of git-buildpackage can be downloaded from the [[!debpkg git-buildpackage desc="Debian Archive"]]. Git snapshots are available [here](http://honk.sigxcpu.org:8001/job/git-buildpackage/).
+### Debian packages
+Debian packages of git-buildpackage can be downloaded from the [[!debpkg git-buildpackage desc="Debian Archive"]].
+
+### Pypi
+
+If not on a Debian system you can fetch the package from [pypi](https://pypi.python.org/pypi/gbp):
+
+    pip install gbp
 
 ## Bugreports
 For enhancements and feature requests you can either use the [Debian bugtracking system](http://bugs.debian.org) or email [me](mailto:agx@sigxcpu.org) directly.
@@ -54,7 +61,7 @@ Here's my current [[gbp.conf]].
 * [[!debbug git-buildpackage desc="bugs"]] filed in the Debian bugtracking system
 
 ## Author
-git-buildpackage was written by [[Guido Günther|/agx]] with contributions from many individuals. See the changelog for attributions.
+git-buildpackage was written by [[Guido Günther|/agx]] with contributions from many individuals. See the [changelog](https://git.sigxcpu.org/cgit/git-buildpackage/tree/debian/changelog) for attributions.
 
 ## License
 git-buildpackage is free software and licensed under the GPL Version 2.

Add skeleton
diff --git a/development/qemu-debugging.mdwn b/development/qemu-debugging.mdwn
new file mode 100644
index 0000000..44a8a7c
--- /dev/null
+++ b/development/qemu-debugging.mdwn
@@ -0,0 +1,63 @@
+# Enable tracing
+In virsh
+
+     qemu-monitor-command <vm> --hmp trace-event usb_xhci_* on
+     qemu-monitor-command <vm> --hmp info trace-events
+
+output goes to /var/log/libvirt/qemu/<vm>.log by default
+
+# 9pfs
+* Libvirt XML
+
+        <filesystem type='mount' accessmode='mapped'>
+            <source dir='/cache/ltstest'/>
+            <target dir='ltstest'/>
+        </filesystem>
+
+*mapped* is important. It uses extended attributes so it needs user_xattr on the host filesystem.
+
+Guests fstab:
+
+    ltstest /ltstest 9p   trans=virtio,version=9p2000.L,rw 0 0
+
+Do
+
+    cd /ltstest && touch a
+
+results on the host as extended attributes
+
+     # attr -l a
+     Attribute "virtfs.uid" has a 4 byte value for a
+     Attribute "virtfs.gid" has a 4 byte value for a
+     Attribute "virtfs.mode" has a 4 byte value for a
+
+For details on 9pfs see http://man.cat-v.org/plan_9/5/intro
+
+# Hot (un)plug Devices #
+
+## PCI devices ##
+
+    http://www.linux-kvm.org/page/Hotadd_pci_devices
+
+## UARTs ##
+
+    http://nairobi-embedded.org/qemu_character_devices.html
+
+## Sound ##
+Devices are not hotpluggable via libvirt
+([#1417464](https://bugzilla.redhat.com/show_bug.cgi?id=1417464)) but
+via QMP monitor:
+
+        qemu-monitor-command <vm> '{ "execute": "device_add",  "arguments": { "driver": "ES1370", "id": "snd1" }}'
+		qemu-monitor-command <vm> '{ "execute": "device_del",  "arguments": { "id": "snd1" }}
+
+        qemu-monitor-command <vm> '{ "execute": "device_add",  "arguments": { "driver": "AC97", "id": "snd2" }}'
+		qemu-monitor-command <vm> '{ "execute": "device_del",  "arguments": { "id": "snd2" }}
+
+[More details on QMP commands](https://git.qemu.org/?p=qemu.git;a=blob;f=qapi-schema.json)
+
+# Misc #
+
+* List all devices:
+
+        qemu-system-x86_64 -device ?

gbp.conf:2017 revamp
diff --git a/projects/git-buildpackage/gbp.conf b/projects/git-buildpackage/gbp.conf
index b959f77..bef74e4 100644
--- a/projects/git-buildpackage/gbp.conf
+++ b/projects/git-buildpackage/gbp.conf
@@ -4,6 +4,30 @@ sign-tags = True
 keyid = 0xB999CDB58C8DDBD2
 # use pristine tar by default
 pristine-tar = True
+dist = DEP14
+
+## The gbp commands ##
+[buildpackage]
+# Automatically push to remote repo after tagging a new release
+posttag = /var/scratch/debian/git-buildpackage/git-buildpackage/examples/gbp-posttag-push -u
+# Setup tmpfs for pbuilder
+prebuild = /home/agx/bin/tmpfs-build
+# Run Lintian after a succesful build
+postbuild = lintian $GBP_CHANGES_FILE
+# Build command
+#builder = dpkg-buildpackage -i -I -uc -us
+# Clean command
+cleaner = /bin/true
+pbuilder = True
+pbuilder-options = --hookdir /home/agx/.pbuilder/hooks
+
+[import-orig]
+# Automatically forward the changelog after importing a new upstream version
+postimport = gbp dch -S -a --debian-branch=$GBP_BRANCH && git commit --amend -C@{0} debian/changelog
+import-msg = New upstream version %(version)s
+interactive = False
+# Don't bother merging the upstream branch, we know how the result should look like:
+merge-mode=replace
 
 [dch]
 # Parse meta tags like Closes: from commit messages
@@ -20,38 +44,36 @@ ignore-regex = (Signed-off|Acked)-by|git-svn-id:
 git-author = True
 # Merge changelog entries by maintainer
 multimaint-merge = True
-
-[buildpackage]
-# Automatically push to remote repo after tagging a new release
-posttag = /usr/share/doc/git-buildpackage/examples/gbp-posttag-push
-# Run Lintian after a succesful build
-postbuild = lintian $GBP_CHANGES_FILE
-# Build command
-builder = dpkg-buildpackage -i -I -uc -us
-# Clean command
-cleaner = /bin/true
-pbuilder = True
-pbuilder-options = --hookdir /home/agx/.pbuilder/hooks
-
-[import-orig]
-# Automatically forward the changelog after importing a new upstream version
-#postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH
-import-msg = New upstream version %(version)s
-interactive = False
+# Always ignore branch
+ignore-branch = True
 
 [import-dsc]
 sign-tags = False
 allow-unauthenticated = True
 
+[pq]
+patch-numbers = False
+
+## Remote sites we create repos at ##
 [remote-config pkg-libvirt]
-# Location of the repository
-remote-url-pattern = ssh://git.debian.org/git/pkg-libvirt/%(pkg)s
-# Template dir to passed to git-init
+remote-url-pattern = ssh://git.debian.org/git/pkg-libvirt/%(pkg)s.git
 template-dir = /srv/alioth.debian.org/chroot/home/groups/pkg-libvirt/git-template
 
 [remote-config calendarserver]
-# Location of the repository
-remote-url-pattern = ssh://git.debian.org/git/calendarserver/%(pkg)s
+remote-url-pattern = ssh://git.debian.org/git/calendarserver/%(pkg)s.git
+
+# Git push based 'CI'
+[remote-config cowbuilder]
+bare = False
+template-dir = /home/agx/pkgs/templates
+remote-url-pattern = ssh://cowbuilder/~/pkgs/%(pkg)s
+
+[remote-config test] 
+remote-url-pattern = ssh://honk.dyn.sigxcpu.org/~/%(pkg)s.git
+
+## Hooks can put config in here too ##
+[gbp-posttag-push]
+upload-cmd = source-only-upload
+#upload-cmd = true
+#pristine-tar = False
 
-[pq]
-patch-numbers = False

Add link to repo
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
index fa5031c..cde9e9b 100644
--- a/hw/merkur-board/macs.org
+++ b/hw/merkur-board/macs.org
@@ -23,6 +23,7 @@
   [[file:merkur-board-flash-1st-stage-2.jpg]]
 
   Steps:
+  - Clone https://github.com/agx/merkur-board-helpers
   - Connect AVR Dragon
   - Supply 3.3V Power
   - after turning on power flush the boot loader right away

Add image
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
index a671c31..fa5031c 100644
--- a/hw/merkur-board/macs.org
+++ b/hw/merkur-board/macs.org
@@ -48,6 +48,11 @@
 * <2017-01-15 Sun> - Eigenbau 2 with correct mac
   - Added clean before each flash so we get a fresh firmware built with the right mac
   - Reflashed first stage bootloader
+#+BEGIN_SRC shell
+       make NUM=2
+#+END_SRC
+  - Reflashed contiki
+  - pings
 #+BEGIN_EXAMPLE
        # Eigenbau 2
        $ ping6  -I tun0 2001:db8:c001:f00d:221:2eff:ff00:642f
@@ -58,17 +63,19 @@
        1 packets transmitted, 1 received, 0% packet loss, time 0ms
        rtt min/avg/max/mdev = 131.181/131.181/131.181/0.000 ms
 #+END_EXAMPLE
-   - Flashed climate2 on 4 and attached DHT21
+   - Flashed first stage bootloader with correct mac and climate2 contiki on 4 and attached DHT22
 
-     | Pin DHT21 | PIN Merkur-board |
+     | Pin DHT22 | PIN Merkur-board |
      |-----------+------------------|
      |         1 | +3.3V            |
      |         2 | D3               |
      |         3 | N/C              |
      |         4 | GND              | 
 
-     (Pins on DHT21 left to right)
+     (Pins on DHT22 left to right)
+     [[file:./merkur-board-dht22.jpg]]
 
+   - answers coap requests
 #+BEGIN_EXAMPLE
        $ ping6 -c1  -I tun0 2001:db8:c001:f00d:221:2eff:ff00:6535
        PING 2001:db8:c001:f00d:221:2eff:ff00:6535(2001:db8:c001:f00d:221:2eff:ff00:6535) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
diff --git a/hw/merkur-board/merkur-board-dht22.jpg b/hw/merkur-board/merkur-board-dht22.jpg
new file mode 100644
index 0000000..01ad9a5
Binary files /dev/null and b/hw/merkur-board/merkur-board-dht22.jpg differ

Number 4 lives
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
index 8af50cf..a671c31 100644
--- a/hw/merkur-board/macs.org
+++ b/hw/merkur-board/macs.org
@@ -59,6 +59,16 @@
        rtt min/avg/max/mdev = 131.181/131.181/131.181/0.000 ms
 #+END_EXAMPLE
    - Flashed climate2 on 4 and attached DHT21
+
+     | Pin DHT21 | PIN Merkur-board |
+     |-----------+------------------|
+     |         1 | +3.3V            |
+     |         2 | D3               |
+     |         3 | N/C              |
+     |         4 | GND              | 
+
+     (Pins on DHT21 left to right)
+
 #+BEGIN_EXAMPLE
        $ ping6 -c1  -I tun0 2001:db8:c001:f00d:221:2eff:ff00:6535
        PING 2001:db8:c001:f00d:221:2eff:ff00:6535(2001:db8:c001:f00d:221:2eff:ff00:6535) from 2001:db8:c001:f00d::1 tun0: 56 data bytes

Number 4 lives
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
index 79d2a1d..8af50cf 100644
--- a/hw/merkur-board/macs.org
+++ b/hw/merkur-board/macs.org
@@ -9,7 +9,7 @@
 | Eigenbau 1                 | 00:21:2e:ff:ff:00:66:59 |                          | ?                                        | ?                      | ?                      |
 | Eigenbau 2                 | 00:21:2e:ff:ff:00:64:2f |                          | 7281120a685f12fb4b6c3c248e5f4c81c63397ab | arduino-plantobserving | ok                     |
 | Eigenbau 3                 | 00:21:2e:ff:ff:00:67:1e |                          |                                          |                        | 2nd stage flash worked |
-| Eigenbau 4                 | 00:21:2e:ff:ff:00:65:35 |                          | 7281120a685f12fb4b6c3c248e5f4c81c63397ab | climate2               | 2nd stage flash worked |
+| Eigenbau 4                 | 00:21:2e:ff:ff:00:65:35 |                          | 7281120a685f12fb4b6c3c248e5f4c81c63397ab | climate2               | ok                     |
 | Eigenbau 5                 | 00:21:2e:ff:ff:00:66:48 |                          |                                          |                        | 2nd stage flash worked |
 | Eigenbau 6                 | 00:21:2e:ff:ff:00:64:c4 |                          |                                          |                        | 2nd stage flash worked |
 | Eigenbau 7                 | 00:21:2e:ff:ff:00:66:76 |                          |                                          |                        | 2nd stage flash worked |

Further progress
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
index 6477418..79d2a1d 100644
--- a/hw/merkur-board/macs.org
+++ b/hw/merkur-board/macs.org
@@ -1,31 +1,42 @@
 * Current Merkur Board based 6lopan devices
 
 
-| Device                        | eui64 (should)          | eui64 (actual)      | LL Address               | Firmware                                 | Type                   | State                  |
-|-------------------------------+-------------------------+---------------------+--------------------------+------------------------------------------+------------------------+------------------------|
-| OSDomotics gelb/weiße Antenne | 00:21:2e:ff:ff:00:34:7c | -                   | fe80::221:2eff:ff00:347c | f87c6fd158a964b969341eadfa974377d349b51d | arduino-plantobserving | ok                     |
-| OSDomotics weiße Ante         | 00:21:2e:ff:ff:00:33:04 | -                   |                          | f87c6fd158a964b969341eadfa974377d349b51d | rpl-border-router      | ok                     |
-| OSDomotics Carsten            |                         |                     | fe80::221:2eff:ff00:33df | ?                                        | ?                      | ?                      |
-| Eigenbau 1                    | 00:21:2e:ff:ff:00:66:59 |                     |                          | ?                                        | ?                      | ?                      |
-| Eigenbau 2                    | 00:21:2e:ff:ff:00:64:2f | 0-50-56-ff-ff-3-4-5 |                          | 7281120a685f12fb4b6c3c248e5f4c81c63397ab | arduino-plantobserving | ok                     |
-| Eigenbau 3                    | 00:21:2e:ff:ff:00:67:1e |                     |                          |                                          |                        | 2nd stage flash worked |
-| Eigenbau 4                    | 00:21:2e:ff:ff:00:65:35 |                     |                          |                                          |                        | 2nd stage flash worked |
-| Eigenbau 5                    | 00:21:2e:ff:ff:00:66:48 |                     |                          |                                          |                        | 2nd stage flash worked |
-| Eigenbau 6                    | 00:21:2e:ff:ff:00:64:c4 |                     |                          |                                          |                        | 2nd stage flash worked |
-| Eigenbau 7                    | 00:21:2e:ff:ff:00:66:76 |                     |                          |                                          |                        | 2nd stage flash worked |
-| Eigenbau 8                    | 00:21:2e:ff:ff:00:67:01 |                     |                          |                                          |                        | defekt                 |
+| Device                     | eui64 (should)          | LL Address               | Firmware                                 | Type                   | State                  |
+|----------------------------+-------------------------+--------------------------+------------------------------------------+------------------------+------------------------|
+| OSDomotics gelb Antenne    | 00:21:2e:ff:ff:00:34:7c | fe80::221:2eff:ff00:347c | f87c6fd158a964b969341eadfa974377d349b51d | arduino-plantobserving | ok                     |
+| OSDomotics gelb/weiße Ant. | 00:21:2e:ff:ff:00:33:04 |                          | f87c6fd158a964b969341eadfa974377d349b51d | rpl-border-router      | ok                     |
+| OSDomotics Carsten         |                         | fe80::221:2eff:ff00:33df | ?                                        | ?                      | ?                      |
+| Eigenbau 1                 | 00:21:2e:ff:ff:00:66:59 |                          | ?                                        | ?                      | ?                      |
+| Eigenbau 2                 | 00:21:2e:ff:ff:00:64:2f |                          | 7281120a685f12fb4b6c3c248e5f4c81c63397ab | arduino-plantobserving | ok                     |
+| Eigenbau 3                 | 00:21:2e:ff:ff:00:67:1e |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 4                 | 00:21:2e:ff:ff:00:65:35 |                          | 7281120a685f12fb4b6c3c248e5f4c81c63397ab | climate2               | 2nd stage flash worked |
+| Eigenbau 5                 | 00:21:2e:ff:ff:00:66:48 |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 6                 | 00:21:2e:ff:ff:00:64:c4 |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 7                 | 00:21:2e:ff:ff:00:66:76 |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 8                 | 00:21:2e:ff:ff:00:67:01 |                          |                                          |                        | defekt                 |
 
 * <2016-11-12 Sa> - Solder Merkur Boards 
   as of https://github.com/tijuca/lowpan-pcb-designs in Fr
 * <2016-12-04 So> - Flashed [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai)
   Several boards won't accept a second stage bootloader afterwards, reason yet unknown
+  [[file:merkur-board-flash-1st-stage-1.jpg]]
+  [[file:merkur-board-flash-1st-stage-2.jpg]]
+
+  Steps:
+  - Connect AVR Dragon
+  - Supply 3.3V Power
+  - after turning on power flush the boot loader right away
+#+BEGIN_SRC shell
+   make NUM=2
+#+END_SRC
+  
 * <2016-12-11 Sun> - Eigenbau 2 pingable
     - We're using the deRFmega128-22M10 with a Atmega128rfa1 so the default *TARGET=osd-merkur-128* is ok for us
     - flash new Contiki (as of 0812b89) since f87c6f crashes early, likely due to us using the [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai) now
     - set the channel back to 26 as in f87c6f, defaults to 25 otherwise
     - slip6 see https://honk.sigxcpu.org/piki/hw/merkur-board/
     - ping
-
+#+BEGIN_EXAMPLE
         $ ping6 -c 1 -I tun0 2001:db8:c001:f00d:250:56ff:ff03:0405
         PING 2001:db8:c001:f00d:250:56ff:ff03:0405(2001:db8:c001:f00d:250:56ff:ff03:405) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
         64 bytes from 2001:db8:c001:f00d:250:56ff:ff03:405: icmp_seq=1 ttl=63 time=526 ms
@@ -33,7 +44,49 @@
         --- 2001:db8:c001:f00d:250:56ff:ff03:0405 ping statistics ---
         1 packets transmitted, 1 received, 0% packet loss, time 0ms
        rtt min/avg/max/mdev = 526.776/526.776/526.776/0.000 ms
+#+END_EXAMPLE
+* <2017-01-15 Sun> - Eigenbau 2 with correct mac
+  - Added clean before each flash so we get a fresh firmware built with the right mac
+  - Reflashed first stage bootloader
+#+BEGIN_EXAMPLE
+       # Eigenbau 2
+       $ ping6  -I tun0 2001:db8:c001:f00d:221:2eff:ff00:642f
+       PING 2001:db8:c001:f00d:221:2eff:ff00:642f(2001:db8:c001:f00d:221:2eff:ff00:642f) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
+       64 bytes from 2001:db8:c001:f00d:221:2eff:ff00:642f: icmp_seq=1 ttl=63 time=131 ms
+
+       --- 2001:db8:c001:f00d:221:2eff:ff00:642f ping statistics ---
+       1 packets transmitted, 1 received, 0% packet loss, time 0ms
+       rtt min/avg/max/mdev = 131.181/131.181/131.181/0.000 ms
+#+END_EXAMPLE
+   - Flashed climate2 on 4 and attached DHT21
+#+BEGIN_EXAMPLE
+       $ ping6 -c1  -I tun0 2001:db8:c001:f00d:221:2eff:ff00:6535
+       PING 2001:db8:c001:f00d:221:2eff:ff00:6535(2001:db8:c001:f00d:221:2eff:ff00:6535) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
+       64 bytes from 2001:db8:c001:f00d:221:2eff:ff00:6535: icmp_seq=1 ttl=63 time=146 ms
+
+       --- 2001:db8:c001:f00d:221:2eff:ff00:6535 ping statistics ---
+       1 packets transmitted, 1 received, 0% packet loss, time 0ms
+       rtt min/avg/max/mdev = 146.315/146.315/146.315/0.000 ms
+
+       $ ./coap-client -m get coap://[2001:db8:c001:f00d:221:2eff:ff00:6535]/.well-known/core
+       v:1 t:CON c:GET i:fad7 {} [ ]
+       </.well-known/core>;ct=40,</s/hum>;title="Humidity DHTxx";rt="huv:1 t:CON c:GET i:fad8 {} [ ]
+       midity %",</s/temp>;title="Temperature DHTxx";rt="temperature c"v:1 t:CON c:GET i:fad9 {} [ ]
+       ,</info>;title="Info";rt="text",</a/leds>;title="LEDs: ?color=r|v:1 t:CON c:GET i:fada {} [ ]
+       g|b, POST/PUT mode=on|off";rt="Control",</s/battery>;title="Battv:1 t:CON c:GET i:fadb {} [ ]
+       ery status";rt="Battery"
+
+       $./coap-client -m get coap://[2001:db8:c001:f00d:221:2eff:ff00:6535]/s/hum
+       v:1 t:CON c:GET i:5744 {} [ ]
+       24.60
+       ./coap-client -m get coap://[2001:db8:c001:f00d:221:2eff:ff00:6535]/s/temp
+       v:1 t:CON c:GET i:bbd5 {} [ ]
+       22.90
+#+END_EXAMPLE
 
-* TODOs
-    - [ ] flash bootloader again with correct MAC, so far we flashed the default in the bonsai code
+* Further TODOs
+  - [X] flash bootloader again with correct MAC, so far we flashed the default in the bonsai code
+  - [X] add antenna
+  - [X] add temp sensor
+  - [X] flash temp firmware
 
diff --git a/hw/merkur-board/merkur-board-flash-1st-stage-1.jpg b/hw/merkur-board/merkur-board-flash-1st-stage-1.jpg
new file mode 100644
index 0000000..f868e9b
Binary files /dev/null and b/hw/merkur-board/merkur-board-flash-1st-stage-1.jpg differ
diff --git a/hw/merkur-board/merkur-board-flash-1st-stage-2.jpg b/hw/merkur-board/merkur-board-flash-1st-stage-2.jpg
new file mode 100644
index 0000000..53a8ccd
Binary files /dev/null and b/hw/merkur-board/merkur-board-flash-1st-stage-2.jpg differ

Use https URLs for clones
diff --git a/templates/honk_git b/templates/honk_git
index 0968a03..90bd7b2 100644
--- a/templates/honk_git
+++ b/templates/honk_git
@@ -1,6 +1,6 @@
 ### Source Code
 The source code is available via:
 
-    git clone git://honk.sigxcpu.org/git/<TMPL_VAR repo>.git
+    git clone https://git.sigxcpu.org/cgit/<TMPL_VAR repo>
 
 and can be browsed [here](https://git.sigxcpu.org/cgit/<TMPL_VAR repo>).

improve readability
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
index 1b4ec2e..6477418 100644
--- a/hw/merkur-board/macs.org
+++ b/hw/merkur-board/macs.org
@@ -20,20 +20,20 @@
 * <2016-12-04 So> - Flashed [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai)
   Several boards won't accept a second stage bootloader afterwards, reason yet unknown
 * <2016-12-11 Sun> - Eigenbau 2 pingable
-**  We're using the deRFmega128-22M10 with a Atmega128rfa1 so the default *TARGET=osd-merkur-128* is ok for us
-** flash new Contiki sine f87c6f crashes early, likely due to us using the [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai) now
-** set the channel back to 26 as in f87c6f, defaults to 25 otherwise
-** slip6 see https://honk.sigxcpu.org/piki/hw/merkur-board/
-** ping
+    - We're using the deRFmega128-22M10 with a Atmega128rfa1 so the default *TARGET=osd-merkur-128* is ok for us
+    - flash new Contiki (as of 0812b89) since f87c6f crashes early, likely due to us using the [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai) now
+    - set the channel back to 26 as in f87c6f, defaults to 25 otherwise
+    - slip6 see https://honk.sigxcpu.org/piki/hw/merkur-board/
+    - ping
 
-    $ ping6 -c 1 -I tun0 2001:db8:c001:f00d:250:56ff:ff03:0405
-    PING 2001:db8:c001:f00d:250:56ff:ff03:0405(2001:db8:c001:f00d:250:56ff:ff03:405) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
-    64 bytes from 2001:db8:c001:f00d:250:56ff:ff03:405: icmp_seq=1 ttl=63 time=526 ms
+        $ ping6 -c 1 -I tun0 2001:db8:c001:f00d:250:56ff:ff03:0405
+        PING 2001:db8:c001:f00d:250:56ff:ff03:0405(2001:db8:c001:f00d:250:56ff:ff03:405) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
+        64 bytes from 2001:db8:c001:f00d:250:56ff:ff03:405: icmp_seq=1 ttl=63 time=526 ms
     
-    --- 2001:db8:c001:f00d:250:56ff:ff03:0405 ping statistics ---
-    1 packets transmitted, 1 received, 0% packet loss, time 0ms
-    rtt min/avg/max/mdev = 526.776/526.776/526.776/0.000 ms
+        --- 2001:db8:c001:f00d:250:56ff:ff03:0405 ping statistics ---
+        1 packets transmitted, 1 received, 0% packet loss, time 0ms
+       rtt min/avg/max/mdev = 526.776/526.776/526.776/0.000 ms
 
-* TODO
-** flash bootloader again with correct MAC, so far we flashed the default in the bonsai code
+* TODOs
+    - [ ] flash bootloader again with correct MAC, so far we flashed the default in the bonsai code
 

Update
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
index e1ac4f4..1b4ec2e 100644
--- a/hw/merkur-board/macs.org
+++ b/hw/merkur-board/macs.org
@@ -20,6 +20,7 @@
 * <2016-12-04 So> - Flashed [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai)
   Several boards won't accept a second stage bootloader afterwards, reason yet unknown
 * <2016-12-11 Sun> - Eigenbau 2 pingable
+**  We're using the deRFmega128-22M10 with a Atmega128rfa1 so the default *TARGET=osd-merkur-128* is ok for us
 ** flash new Contiki sine f87c6f crashes early, likely due to us using the [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai) now
 ** set the channel back to 26 as in f87c6f, defaults to 25 otherwise
 ** slip6 see https://honk.sigxcpu.org/piki/hw/merkur-board/
@@ -34,5 +35,5 @@
     rtt min/avg/max/mdev = 526.776/526.776/526.776/0.000 ms
 
 * TODO
-** flash bootloader again, current contiki doesn't recognize the stored MAC (or we didn't store it correctly)
+** flash bootloader again with correct MAC, so far we flashed the default in the bonsai code
 

merkur board brain dump
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
new file mode 100644
index 0000000..e1ac4f4
--- /dev/null
+++ b/hw/merkur-board/macs.org
@@ -0,0 +1,38 @@
+* Current Merkur Board based 6lopan devices
+
+
+| Device                        | eui64 (should)          | eui64 (actual)      | LL Address               | Firmware                                 | Type                   | State                  |
+|-------------------------------+-------------------------+---------------------+--------------------------+------------------------------------------+------------------------+------------------------|
+| OSDomotics gelb/weiße Antenne | 00:21:2e:ff:ff:00:34:7c | -                   | fe80::221:2eff:ff00:347c | f87c6fd158a964b969341eadfa974377d349b51d | arduino-plantobserving | ok                     |
+| OSDomotics weiße Ante         | 00:21:2e:ff:ff:00:33:04 | -                   |                          | f87c6fd158a964b969341eadfa974377d349b51d | rpl-border-router      | ok                     |
+| OSDomotics Carsten            |                         |                     | fe80::221:2eff:ff00:33df | ?                                        | ?                      | ?                      |
+| Eigenbau 1                    | 00:21:2e:ff:ff:00:66:59 |                     |                          | ?                                        | ?                      | ?                      |
+| Eigenbau 2                    | 00:21:2e:ff:ff:00:64:2f | 0-50-56-ff-ff-3-4-5 |                          | 7281120a685f12fb4b6c3c248e5f4c81c63397ab | arduino-plantobserving | ok                     |
+| Eigenbau 3                    | 00:21:2e:ff:ff:00:67:1e |                     |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 4                    | 00:21:2e:ff:ff:00:65:35 |                     |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 5                    | 00:21:2e:ff:ff:00:66:48 |                     |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 6                    | 00:21:2e:ff:ff:00:64:c4 |                     |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 7                    | 00:21:2e:ff:ff:00:66:76 |                     |                          |                                          |                        | 2nd stage flash worked |
+| Eigenbau 8                    | 00:21:2e:ff:ff:00:67:01 |                     |                          |                                          |                        | defekt                 |
+
+* <2016-11-12 Sa> - Solder Merkur Boards 
+  as of https://github.com/tijuca/lowpan-pcb-designs in Fr
+* <2016-12-04 So> - Flashed [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai)
+  Several boards won't accept a second stage bootloader afterwards, reason yet unknown
+* <2016-12-11 Sun> - Eigenbau 2 pingable
+** flash new Contiki sine f87c6f crashes early, likely due to us using the [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai) now
+** set the channel back to 26 as in f87c6f, defaults to 25 otherwise
+** slip6 see https://honk.sigxcpu.org/piki/hw/merkur-board/
+** ping
+
+    $ ping6 -c 1 -I tun0 2001:db8:c001:f00d:250:56ff:ff03:0405
+    PING 2001:db8:c001:f00d:250:56ff:ff03:0405(2001:db8:c001:f00d:250:56ff:ff03:405) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
+    64 bytes from 2001:db8:c001:f00d:250:56ff:ff03:405: icmp_seq=1 ttl=63 time=526 ms
+    
+    --- 2001:db8:c001:f00d:250:56ff:ff03:0405 ping statistics ---
+    1 packets transmitted, 1 received, 0% packet loss, time 0ms
+    rtt min/avg/max/mdev = 526.776/526.776/526.776/0.000 ms
+
+* TODO
+** flash bootloader again, current contiki doesn't recognize the stored MAC (or we didn't store it correctly)
+

G_DEBUG_MESSAGES
diff --git a/development/debugging.mdwn b/development/debugging.mdwn
index feef8b5..1b0369a 100644
--- a/development/debugging.mdwn
+++ b/development/debugging.mdwn
@@ -75,6 +75,14 @@ To abort on the first encountered glib/GTK+ warning use:
 
     <program> --g-fatal-warnings
 
+## Printing Glib messages
+
+Print all messages:
+
+    G_MESSAGES_DEBUG=all <program> 
+
+See the [Glib manual][] for details.
+
 # Other tools
 * valgrind
 * strace,  ltrace
@@ -90,3 +98,4 @@ And when debugging GTK+ related problems:
 
     aptitude install libglib2.0-0-dbg libgnutls26-dbg libgtk2.0-0-dbg libpcre3-dbg vim-syntax-gtk gtkparasite
 
+[Glib manual]: https://developer.gnome.org/glib/stable/glib-running.html

Fix links to cgit
diff --git a/templates/honk_git b/templates/honk_git
index c6c46cd..0968a03 100644
--- a/templates/honk_git
+++ b/templates/honk_git
@@ -3,4 +3,4 @@ The source code is available via:
 
     git clone git://honk.sigxcpu.org/git/<TMPL_VAR repo>.git
 
-and can be browsed [here](https://honk.sigxcpu.org/gitweb/?p=<TMPL_VAR repo>.git).
+and can be browsed [here](https://git.sigxcpu.org/cgit/<TMPL_VAR repo>).

Add kopano talk
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index 8890469..2aa9257 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,6 +1,8 @@
 ### Talks / BoFs
 
-[GBP skills exchange](https://debconf16.debconf.org/talks/132/) at Debconf 16, Cape Town, South Africa July 2016
+[The State of Kopano in Debian](https://git.sigxcpu.org/cgit/talks/2016-10-kopano-conference/) at the [Kopano Conference](https://kopano.com/conference/#program), Castle Vaalsbroek, Netherlands Octover 2016
+
+GBP skills exchange at [Debconf 16](https://debconf16.debconf.org/talks/132/), Cape Town, South Africa July 2016
 
 [Wissenswertes über Erlang](https://git.sigxcpu.org/cgit/talks/2016-09-fsfe-bonn-erlang/) at FSFE Fellowship Meeting, Bonn, Germany May 2016
 

Add gbp skills exchange
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index 77e044e..8890469 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,4 +1,6 @@
-### Talks
+### Talks / BoFs
+
+[GBP skills exchange](https://debconf16.debconf.org/talks/132/) at Debconf 16, Cape Town, South Africa July 2016
 
 [Wissenswertes über Erlang](https://git.sigxcpu.org/cgit/talks/2016-09-fsfe-bonn-erlang/) at FSFE Fellowship Meeting, Bonn, Germany May 2016
 
@@ -37,9 +39,9 @@ at [Debconf 9](https://penta.debconf.org/dc9_schedule/events/444.en.html), Cáce
 
 Guido Günther und Matthias Schmitz: [Festplattenüberwachung mit den Smartmontools](http://www.linuxtechnicalreview.de/Vorschau/%28show%29/Themen/Storage-und-Backup/Festplattenueberwachung-mit-den-Smartmontools), Linux Technical Review 03/2007, pp. 88
 
-M. Dreher, D. Fischer, K. Franzrahe, G. Günther, P. Henseler, J. Hoffmann, W. Strepp, P. Nielaba: [Numerical Investigations of Complex Nano-Systems](http://www.fz-juelich.de/nic-series/volume20/nielaba.pdf), NIC Symposium 2004, Preoceedings, pp. 291
+M\. Dreher, D. Fischer, K. Franzrahe, G. Günther, P. Henseler, J. Hoffmann, W. Strepp, P. Nielaba: [Numerical Investigations of Complex Nano-Systems](http://www.fz-juelich.de/nic-series/volume20/nielaba.pdf), NIC Symposium 2004, Preoceedings, pp. 291
 
-M. Dreher, D. Fischer, K. Franzrahe, G. Günther, P. Henseler, J. Hoffmann, W. Strepp, P. Nielaba: [Numerical studies of collective effects in nano-systems](http://books.google.com/books?id=_cYAQ4fp0FoC&pg=PA139&lpg=PA139&dq=Numerical+Studies+of+collective+effects+in+nano+systems+nielaba&source=bl&ots=ITSSiK_EGE&sig=mVVmHuj3J8psVc2be38s__hrwl8&hl=en&ei=mBkVTJbKMYz24AbEmdWzDA&sa=X&oi=book_result&ct=result&resnum=3&ved=0CBsQ6AEwAg), High Performance Computing in Science and Engineering 2003, pp. 193
+M\. Dreher, D. Fischer, K. Franzrahe, G. Günther, P. Henseler, J. Hoffmann, W. Strepp, P. Nielaba: [Numerical studies of collective effects in nano-systems](http://books.google.com/books?id=_cYAQ4fp0FoC&pg=PA139&lpg=PA139&dq=Numerical+Studies+of+collective+effects+in+nano+systems+nielaba&source=bl&ots=ITSSiK_EGE&sig=mVVmHuj3J8psVc2be38s__hrwl8&hl=en&ei=mBkVTJbKMYz24AbEmdWzDA&sa=X&oi=book_result&ct=result&resnum=3&ved=0CBsQ6AEwAg), High Performance Computing in Science and Engineering 2003, pp. 193
 
 
 [1]: http://media.ccc.de/browse/conferences/froscon/2011/hs4_-_2011-08-20_11:15_-_the_gnome3_desktop_and_you_-_guido_gunther_-_770.html

Remove dups
diff --git a/development/apparmor-debugging.mdwn b/development/apparmor-debugging.mdwn
index 8cf1a50..d24bccf 100644
--- a/development/apparmor-debugging.mdwn
+++ b/development/apparmor-debugging.mdwn
@@ -22,18 +22,13 @@ and check for denails, turn them into "audit deny" for debugging.
 
     echo -n noquiet >/sys/module/apparmor/parameters/audit
 
+See [826218][] for details.
+
 ## Other things to watch out for
 
 * Process environments are usually cleared. So if a confined process spawns
   a subprocess that relies on environments vars this might trigger problems
 
-## Other knobs to try
-
-    echo 1 > /sys/module/apparmor/parameters/debug
-	echo -n noquiet >/sys/module/apparmor/parameters/audit
-
-See [826218][] for details.
-
 [1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826218
 [2]: http://wiki.apparmor.net/index.php/QuickProfileLanguage
 

Add more apparmor knobs
diff --git a/development/apparmor-debugging.mdwn b/development/apparmor-debugging.mdwn
index 8a0244f..8cf1a50 100644
--- a/development/apparmor-debugging.mdwn
+++ b/development/apparmor-debugging.mdwn
@@ -14,11 +14,27 @@ This does not track [denials][1]. So do a
 
 and check for denails, turn them into "audit deny" for debugging.
 
+## Check environment scrubbing
+
+    echo 1 > /sys/module/apparmor/parameters/debugging
+
+## Turn off deny audit quieting
+
+    echo -n noquiet >/sys/module/apparmor/parameters/audit
+
 ## Other things to watch out for
 
 * Process environments are usually cleared. So if a confined process spawns
   a subprocess that relies on environments vars this might trigger problems
 
+## Other knobs to try
+
+    echo 1 > /sys/module/apparmor/parameters/debug
+	echo -n noquiet >/sys/module/apparmor/parameters/audit
+
+See [826218][] for details.
 
 [1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826218
 [2]: http://wiki.apparmor.net/index.php/QuickProfileLanguage
+
+[826218]: http://bugs.debian.org/826218

Some apparmor debugging
diff --git a/development/apparmor-debugging.mdwn b/development/apparmor-debugging.mdwn
new file mode 100644
index 0000000..8a0244f
--- /dev/null
+++ b/development/apparmor-debugging.mdwn
@@ -0,0 +1,24 @@
+# Apparmor Debugging
+
+First look at the processes profile and skim the [query language][2].
+
+## Tracking denials
+
+Turn on complain mode
+
+    aa-complain <profile>
+
+This does not track [denials][1]. So do a
+
+	apparmor_parser -pq /etc/apparmor.d/the.profile.to.check
+
+and check for denails, turn them into "audit deny" for debugging.
+
+## Other things to watch out for
+
+* Process environments are usually cleared. So if a confined process spawns
+  a subprocess that relies on environments vars this might trigger problems
+
+
+[1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826218
+[2]: http://wiki.apparmor.net/index.php/QuickProfileLanguage

Flattr broke all links, drop them
diff --git a/donations.mdwn b/donations.mdwn
index d96d129..7852513 100644
--- a/donations.mdwn
+++ b/donations.mdwn
@@ -3,7 +3,6 @@
 In case you find any of the sigxcpu.org [[projects|index]] useful and you want
 to support my work you can do so either by:
 
-* Flattr'ing them on [flattr.com](https://flattr.com/profile/agx)
 * Hiring me as a [freelancer][1] to work on these projects.
 
 [1]: http://godiug.net
diff --git a/projects/arcboot.mdwn b/projects/arcboot.mdwn
index 11c12db..b1dd4d6 100644
--- a/projects/arcboot.mdwn
+++ b/projects/arcboot.mdwn
@@ -21,7 +21,6 @@ machine. The loader then extracts kernel and initramfs from itself into the
 correct memory locations and starts the kernel passing the address of the
 initramfs on the kernel command line.
 
-[[!template  id=flattr thing="48460" name="Colors-of-Noise"]]
 [[!template  id=honk_git repo="arcboot"]]
 
 ### Releases
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index 24b4526..fc15a45 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -20,8 +20,6 @@ There are some helpers in */usr/share/doc/git-buildpackage/examples/*:
 * *gbp-posttag-push*: posttag hook for *gbp buildpackage* to push out the necessary changes to a remote repository after a release
 * *gbp-add-patch*: Commits a patch to the current branch and uses the Path Header for the commit message, useful after *gbp pq export*.
 
-[[!template  id=flattr thing="48091" name="Git-buildpackage"]]
-
 ## Documentation
 * git-buildpackage's [official manual](http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.html).
 * A possible workflow for maintaining [[development/debian packages in git]].
diff --git a/projects/krb5-auth-dialog.mdwn b/projects/krb5-auth-dialog.mdwn
index 694db2c..38ee2e0 100644
--- a/projects/krb5-auth-dialog.mdwn
+++ b/projects/krb5-auth-dialog.mdwn
@@ -19,8 +19,6 @@ Krb5-auth-dialog is a tray applet for the [GNOME](http://gnome.org) Desktop that
 * [DBus][] signals notify applications about acquired, renewed and expired tickets.
 * It supports PKinit (e.g. via SmartCard) when built against [Heimdal](http://h5l.org).
 
-[[!template  id=flattr thing="48094" name="krb5-auth-dialog"]]
-
 ## Source Code
 The source code is available and browseable via [GNOMEs GIT](http://git.gnome.org/cgit/krb5-auth-dialog/):
 
diff --git a/projects/libplanfahr.mdwn b/projects/libplanfahr.mdwn
index 497bbaa..6382488 100644
--- a/projects/libplanfahr.mdwn
+++ b/projects/libplanfahr.mdwn
@@ -15,7 +15,6 @@ LibPlanFahr is currently alpha quality software.
 * It's [introspectable][2] so it's easily usable from different languages
 * It's asynchronous
 
-[[!template  id=flattr thing="48460" name="Colors-of-Noise"]]
 [[!template  id=honk_git repo="libplanfahr"]]
 
 ### Documentation
diff --git a/projects/munin-pelletronic.mdwn b/projects/munin-pelletronic.mdwn
index 4e5d06d..01c09eb 100644
--- a/projects/munin-pelletronic.mdwn
+++ b/projects/munin-pelletronic.mdwn
@@ -33,7 +33,6 @@ It can graph and monitor:
 ## Installation
 See the README document in the sources.
 
-[[!template  id=flattr thing="48460" name="Colors-of-Noise"]]
 [[!template  id=honk_git repo="munin-pelletronic"]]
 
 ## Tested Versions
diff --git a/projects/network-manager-iodine.mdwn b/projects/network-manager-iodine.mdwn
index 5da685e..69645a4 100644
--- a/projects/network-manager-iodine.mdwn
+++ b/projects/network-manager-iodine.mdwn
@@ -7,8 +7,6 @@ access is firewalled but DNS traffic is still allowed.
 
 [[!toc ]]
 
-[[!template  id=flattr thing="494948" name="network-manager-iodine"]]
-
 ### Source Code
 The [source code][code] is available via:
 
diff --git a/projects/ppm.mdwn b/projects/ppm.mdwn
index 02ef8eb..100d792 100644
--- a/projects/ppm.mdwn
+++ b/projects/ppm.mdwn
@@ -42,7 +42,6 @@ bought in e.g. supermarkets or from your provider to top-up a certain amount of
 * It can check the remaining balance via USSD
 * It can top up the balance with a given code via USSD
 
-[[!template  id=flattr thing="460518" name="GNOME-Prepaid-Manager"]]
 [[!template  id=honk_git repo="ppm"]]
 
 ### Releases
diff --git a/projects/sapgui-package.mdwn b/projects/sapgui-package.mdwn
index 14ba626..ec49d48 100644
--- a/projects/sapgui-package.mdwn
+++ b/projects/sapgui-package.mdwn
@@ -12,7 +12,6 @@ for Java](ftp://ftp.sap.com/pub/sapgui/java) from the available .JAR for Linux.
 
         dpkg -i sapgui_7.20rev1_i386.deb
 
-[[!template  id=flattr thing="51815" name="sapgui-package"]]
 [[!template  id=honk_git repo="sapgui-package"]]
     
 ## Debian Package
diff --git a/projects/whatmaps.mdwn b/projects/whatmaps.mdwn
index a7043a5..ed19846 100644
--- a/projects/whatmaps.mdwn
+++ b/projects/whatmaps.mdwn
@@ -53,7 +53,6 @@ To enable automatic restarts during security updates on Debian based systems set
 
 in */etc/apt/apt.conf.d/20services*.
 
-[[!template  id=flattr thing="48460" name="Colors-of-Noise"]]
 [[!template  id=honk_git repo="whatmaps"]]
 
 ## Notes

Flattr broke all links, drop them
diff --git a/templates/flattr b/templates/flattr
deleted file mode 100644
index 801986d..0000000
--- a/templates/flattr
+++ /dev/null
@@ -1,2 +0,0 @@
-<a href="https://flattr.com/thing/<TMPL_VAR thing>/<TMPL_VAR name>" target="_blank">
-<img src="/piki/common/flattr-button-compact-static-100x17.png" alt="Flattr this" title="Flattr this"/></a>

Document "assist" button
diff --git a/hw/sony-SVD1321X9EW.mdwn b/hw/sony-SVD1321X9EW.mdwn
index def990d..fccc668 100644
--- a/hw/sony-SVD1321X9EW.mdwn
+++ b/hw/sony-SVD1321X9EW.mdwn
@@ -44,3 +44,12 @@ Current status of hardware support on the Sony Vaio Duo 13" using Debian/Sid wit
 [3]: http://bugs.debian.org/737186
 [4]: http://bugs.debian.org/745331
 [5]: git://git.lii-enac.fr/linux-input/mtdiag.git
+
+## Installation ##
+
+Prepare a USB stick as [documented][6]. After shutting down Windows
+press the *Assist" button at the bottom side of the laptop next to the
+volume buttons. The then showing menu will allow you to boot from USB
+stick.
+
+[6]: https://www.debian.org/releases/jessie/amd64/ch04s03.html.en

Add Erlang talk add FSFE meeting Bonn
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index e5614ef..77e044e 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,5 +1,7 @@
 ### Talks
 
+[Wissenswertes über Erlang](https://git.sigxcpu.org/cgit/talks/2016-09-fsfe-bonn-erlang/) at FSFE Fellowship Meeting, Bonn, Germany May 2016
+
 [Debian - 22 years and counting](http://honk.sigxcpu.org/talks/2015-09-zarafa/) at [Zarafa Tour 2015](https://www.zarafa.com/register-for-zarafa-tour-2015-the-netherlands-edition/), Woubrugge near Amsterdam, Netherlands, 2015
 
 [[Git-buildpackage BoF|https://git.sigxcpu.org/cgit/talks/2015-08-debconf15-gbp/plain/topics.pdf]] at [[DebConf 15|https://summit.debconf.org/debconf15/meeting/315/git-buildpackage-bof/]] Heidelberg, Germany 2015 ([video][6])

Make it clear that we're not there yet
diff --git a/hw/merkur-board.mdwn b/hw/merkur-board.mdwn
index 640c24a..0a58841 100644
--- a/hw/merkur-board.mdwn
+++ b/hw/merkur-board.mdwn
@@ -103,6 +103,8 @@ when pinging the merkur-board from the Raspberry Pi:
     before compression (40): 6000000000283aff
 	...
 
+...but the Linux node doesn't see the replies. More to come when we have a second pi that can act as monitor.
+
 [0]: http://osdwiki.open-entry.com/doku.php/de:projekte:merkur
 [1]: http://osdwiki.open-entry.com/doku.php/de:projekte:plant_observation_kit
 [2]: http://osdwiki.open-entry.com/doku.php/de:tutorials:first_steps_arduino_ide

Revisiting this problem after almost a year
diff --git a/hw/merkur-board.mdwn b/hw/merkur-board.mdwn
index 76b8696..640c24a 100644
--- a/hw/merkur-board.mdwn
+++ b/hw/merkur-board.mdwn
@@ -7,7 +7,7 @@ some sensors. The [Merkur Board][0] is open hardware:
 
 It has digital outputs as well as digital, analog and PWM outputs and
 supports attaching Arduino Grove Modules which should make experiments
-simple.  In order to test thinks I use the
+simple.  In order to test things I use the
 [Plant Oberservation Kit][1] set.
 
 One uses USB-Serial converter to flash the device. Details on how to
@@ -63,13 +63,12 @@ breakout*][8] flashing works as expected:
 The flashed firmware uses *channel 26* and *pan_id 0xabcd* by default.  This can
 be seen on the serial output (you can use the same serial converter as for
 flashing). To read the serial console I've so far used the serial console
-window from the arduino ide since *screen* doesn't support the 14400 baud used
-by the merkur-board.
+window from the arduino ide since *screen* doesn't support the 38400 baud used
+by the merkur-board ().
 
 While I'm seeing packages looking for a RIPL router send by the merkur-board
 when using a Raspberry Pi as described in [[here|rpi6lowpan]], I can't ping the
-board on it's link local address yet. I can also verify that it detects the
-RIPL router but the device is still not reachable.
+board on it's link local address yet.
 
 So let's for now use a second merkur board as [edge-router][].
 
@@ -90,6 +89,20 @@ We can now query the moisture sensor using [libcoap]:
     $ ./coap-client -m get coap://[2001:db8:c001:f00d:221:2eff:ff00:347c]/moisture/v
 
 
+## Some Linux, Contiki interop progress
+
+Looking into the above problem in some more detail it shows that using
+[[rpi6lowpan]] setup in [monitor mode][] we see all the packages sent
+from the merkur boards on Linux but not vice verca. If we
+[disable sleep mode][] in contiki we can receive frames from Linux
+when pinging the merkur-board from the Raspberry Pi:
+
+    Received NS from fe80::80cd:9a1:845b:4d6a to ff02::1:ff00:3304 with target addressfe80::221:2e��f:ff0N��
+    Sending NA to fe80::80cd:9a1:845b:4d6a from fe80::221:2eff:ff00:3304 with target address fe80::221:2eff:ff00:3304
+    sicslowpan output: sending packet len 80
+    before compression (40): 6000000000283aff
+	...
+
 [0]: http://osdwiki.open-entry.com/doku.php/de:projekte:merkur
 [1]: http://osdwiki.open-entry.com/doku.php/de:projekte:plant_observation_kit
 [2]: http://osdwiki.open-entry.com/doku.php/de:tutorials:first_steps_arduino_ide
@@ -103,3 +116,5 @@ We can now query the moisture sensor using [libcoap]:
 [edge-router]: http://osdwiki.open-entry.com/doku.php/de:tutorials:contiki:merkur_board_rpl_usb_router
 [Find A5]: http://osdwiki.open-entry.com/doku.php/de:products:merkur_grove_board_4
 [libcoap]: http://sourceforge.net/projects/libcoap/
+[monitor mode]: http://wpan.cakelab.org/#_sniffing
+[disable sleep mode]: https://github.com/agx/osd-contiki/commit/5ecf780a4873b6942e50964cfcb3d067b0a60cce
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index e42a623..3ec638d 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -7,7 +7,7 @@ at86rf233) so we can later use it as a e.g. border router.
 [[!img rpiradio.jpg size="x150" alt="Raspberry Pi with 802.15.4 radio"]]
 
 The default Raspberry Pi kernel used to lack support for recent
-[wpan-tools][3]. So we cross build akernel and boot it via tftp.
+[wpan-tools][3]. So we cross build a kernel and boot it via tftp.
 Newer kernels have basic support so you only need to do this if you
 want to hack on the kernel's [6LoWPAN][1] parts.
 

Note that newer Pi models don't work yet
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index f47b472..e42a623 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -6,12 +6,15 @@ at86rf233) so we can later use it as a e.g. border router.
 
 [[!img rpiradio.jpg size="x150" alt="Raspberry Pi with 802.15.4 radio"]]
 
-The default Raspberry Pi kernel lacks support for recent
-[wpan-tools][3]. So we cross build a custom
-built kernel via tftp.
-
-In the following we assume the Raspberry Pi is at IP address 192.168.1.2 and
-does DHCP during boot.
+The default Raspberry Pi kernel used to lack support for recent
+[wpan-tools][3]. So we cross build akernel and boot it via tftp.
+Newer kernels have basic support so you only need to do this if you
+want to hack on the kernel's [6LoWPAN][1] parts.
+
+In the following we assume the Raspberry Pi is at IP
+address 192.168.1.2 and does DHCP during boot. It has been tested on a
+Raspberry Pi B+, the model 2 and model 3 Pis have issues. If you get
+it working on these, let me know.
 
 This is mostly a combination of information from different sites like
 [linux-wpan][3], [openlabs][4] and [eLinux.org][5]. For details head over to

This really is only for RPI fixups
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index 97c8fde..f47b472 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -153,7 +153,7 @@ vie SPI we change the DTS so it gets properly detected. This is
 readily done in my wpan-next (based on Alexanders repo) git repo which
 you can add to the *bluetooth-next* repo you alread cloned above:
 
-    $ git remote add agx git://github.com/agx/linux-wpan-next.git
+    $ git remote add agx git://github.com/agx/linux-wpan-rpi-next.git
     $ git fetch rpi-6lowpan
     $ git checkout -b rpi-6lowpan -b agx/rpi-6lowpan
 

Add notes for RPI2
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index eb0c984..97c8fde 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -102,6 +102,8 @@ Crossbuild U-Boot
     $ make rpi_defconfig
     $ make -j4 -s
 
+In case you're on a RPI2 use rpi\_2\_defconfig instead of rpi_defconfig.
+
 #### On the RPi
 Now configure the RPi to use the just built U-Boot (${PI_IP} being the
 address of your Raspberry Pi). First on copy U-Boot to the Pi:
@@ -130,6 +132,8 @@ This assumes you're using a USB-serial adapter that shows up as
     $ tftp ${fdt_addr_r} ${fdtfile}
     $ bootz ${kernel_addr_r} - ${fdt_addr_r}
 
+If you're using a rpi 2 use *bcm2836-rpi-2-b.dtb* instead of *bcm2835-rpi-b-plus.dtb*.
+
 #### Automate the boot
 Copy the above commands into a file called *boot.src* and do a
 

Fix link
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index 144727c..eb0c984 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -85,11 +85,11 @@ Move the necessary files to the tftp server (${TFT_IP} being the address of your
     $ scp bluetooth-next/arch/arm/boot/zImage ${TFTP_IP}:/tftpboot/rpi.img
     $ scp bluetooth-next/arch/arm/boot/dts/bcm2835-rpi-b-plus.dtb ${TFTP_IP}:/tftpboot/
 
-If you're using another PI model copy the corresponding device tree (dtb) file
+If you're using another PI model copy the corresponding device tree (dtb) file.
 
 ### U-Boot
 We want to boot the kernel using U-Boot so we can conveniently swap out kernels using TFTP.
-This is mostly copied from http://elinux.org/RPi_U-Boot .
+This is mostly copied from [http://elinux.org/RPi_U-Boot](http://elinux.org/RPi_U-Boot) .
 
 #### On the build host
 Crossbuild U-Boot
@@ -115,7 +115,7 @@ and on the Raspberry Pi boot it by default:
     $ poweroff
 
 #### First Boot
-(Again mostly from  http://elinux.org/RPi_U-Boot). Attach to the serial
+(Again mostly from  [http://elinux.org/RPi_U-Boot](http://elinux.org/RPi_U-Boot)). Attach to the serial
 console of your rpi:
 
     $ screen /dev/ttyUSB0 115200

Fix typos and elaborate a bit
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index c69f425..144727c 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -94,9 +94,9 @@ This is mostly copied from http://elinux.org/RPi_U-Boot .
 #### On the build host
 Crossbuild U-Boot
 
-    $ git clone --deth=1 git://git.denx.de/u-boot.git
+    $ git clone --depth=1 git://git.denx.de/u-boot.git
     $ export PATH=~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin:$PATH
-    $ export CROSS_COMPILE=/home/agx/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-
+    $ export CROSS_COMPILE=~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-
     $ export USE_PRIVATE_LIBGCC=yes
 	$ cd u-boot
     $ make rpi_defconfig
@@ -116,16 +116,17 @@ and on the Raspberry Pi boot it by default:
 
 #### First Boot
 (Again mostly from  http://elinux.org/RPi_U-Boot). Attach to the serial
-console
+console of your rpi:
 
-    $ screen /dev/ttyUSB<N> 115200
+    $ screen /dev/ttyUSB0 115200
 
-then power on the RPi and once U-Boot starts do a
+This assumes you're using a USB-serial adapter that shows up as
+*/dev/ttyUSB0*.  Then power on the RPi and once U-Boot starts do a
 
     $ setenv fdtfile bcm2835-rpi-b-plus.dtb
     $ setenv bootargs earlyprintk console=ttyAMA0 console=tty1 root=/dev/mmcblk0p2 rootwait
     $ usb start
-    $ dhcp ${kernel_addr_r} zImage
+    $ dhcp ${kernel_addr_r} rpi.img
     $ tftp ${fdt_addr_r} ${fdtfile}
     $ bootz ${kernel_addr_r} - ${fdt_addr_r}
 
@@ -142,14 +143,15 @@ happen automatically.
 Now that we can quickly change and build kernels lets move to the 6LoWPAN part.
 
 ### Configuring the kernel and patching the DTS
-In order to enable support for the at86rf233 and 802.15.14 radio we need to change
-some kernel configuration. Since the board is connected vie SPI we change the DTS
-so it gets properly detected. This is readily done in this git repo:
+In order to enable support for the at86rf233 and 802.15.14 radio we
+need to change some kernel configuration. Since the board is connected
+vie SPI we change the DTS so it gets properly detected. This is
+readily done in my wpan-next (based on Alexanders repo) git repo which
+you can add to the *bluetooth-next* repo you alread cloned above:
 
-    $ cd linux-wpan-next
     $ git remote add agx git://github.com/agx/linux-wpan-next.git
     $ git fetch rpi-6lowpan
-    $ git co -b rpi-6lowpan -b agx/rpi-6lowpan
+    $ git checkout -b rpi-6lowpan -b agx/rpi-6lowpan
 
 Now lets rebuild DTS and kernel
 

Update
diff --git a/projects/cl2vcs.mdwn b/projects/cl2vcs.mdwn
index bedf3c3..6fd3dcb 100644
--- a/projects/cl2vcs.mdwn
+++ b/projects/cl2vcs.mdwn
@@ -1,6 +1,6 @@
-[Cl2vcs](https://honk.sigxcpu.org/cl2vcs/) is a simple CGI that maps Debian changelogs back to VCS commit ids.
-
-[[!toc ]]
+[Cl2vcs](https://honk.sigxcpu.org/cl2vcs/) is a simple CGI that maps
+Debian changelogs back to VCS commit ids. It currently supports
+gitweb, cgit and the hg repo browser.
 
 ### Source Code
 The source code is available via:

Participants sound more active
diff --git a/hepl/hepl1.mdwn b/hepl/hepl1.mdwn
index da571f0..8e6994a 100644
--- a/hepl/hepl1.mdwn
+++ b/hepl/hepl1.mdwn
@@ -7,7 +7,7 @@
 * Number of Debian Bugs fixed: *2*
 * Files transferred via XMPP: *2*
 
-## Attendees
+## Participants
 * Johannes Hubertz
 * Carsten Schönert
 * Christoph Göhre

Add attendees and fix typo
diff --git a/hepl/hepl1.mdwn b/hepl/hepl1.mdwn
index ddf7f7f..da571f0 100644
--- a/hepl/hepl1.mdwn
+++ b/hepl/hepl1.mdwn
@@ -7,13 +7,20 @@
 * Number of Debian Bugs fixed: *2*
 * Files transferred via XMPP: *2*
 
-Some things that happened:
+## Attendees
+* Johannes Hubertz
+* Carsten Schönert
+* Christoph Göhre
+* Sascha Girrulat
+* [[Guido Günther|agx]]
+
+## Some things that happened
 
 * Uploaded a new version of [iptables-converter][] 0.9.8
 * Fixed icedove's RC bug [#802281][]
 * Uploaded [libvirt][] 1.2.21-rc1 to experimental
 * Finally uploaded a first version of [zarafa][] to experimental
-* Worked on improved apache suppot for [zarafa-webapp][] (not yet in
+* Worked on improved apache support for [zarafa-webapp][] (not yet in
   the archive)
 * Updates to python-selenium & selenium-firefoxdriver (not yet uploaded)
 * Work on making iptables-converter reproducible (not finished yet)

...wait there's more
diff --git a/hepl/hepl1.mdwn b/hepl/hepl1.mdwn
index 06021d7..ddf7f7f 100644
--- a/hepl/hepl1.mdwn
+++ b/hepl/hepl1.mdwn
@@ -16,6 +16,9 @@ Some things that happened:
 * Worked on improved apache suppot for [zarafa-webapp][] (not yet in
   the archive)
 * Updates to python-selenium & selenium-firefoxdriver (not yet uploaded)
+* Work on making iptables-converter reproducible (not finished yet)
+* Work on making gbp import-orig more smart on errors (not finished yet)
+
 
 [iptables-converter]: https://packages.debian.org/source/sid/iptables-converter
 [#802281]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802281

Add version
diff --git a/hepl/hepl1.mdwn b/hepl/hepl1.mdwn
index b1b27ff..06021d7 100644
--- a/hepl/hepl1.mdwn
+++ b/hepl/hepl1.mdwn
@@ -9,11 +9,12 @@
 
 Some things that happened:
 
-* Uploaded a new version of [iptables-converter][]
+* Uploaded a new version of [iptables-converter][] 0.9.8
 * Fixed icedove's RC bug [#802281][]
 * Uploaded [libvirt][] 1.2.21-rc1 to experimental
 * Finally uploaded a first version of [zarafa][] to experimental
-* Worked on improved apache suppot for [zarafa-webapp][]
+* Worked on improved apache suppot for [zarafa-webapp][] (not yet in
+  the archive)
 * Updates to python-selenium & selenium-firefoxdriver (not yet uploaded)
 
 [iptables-converter]: https://packages.debian.org/source/sid/iptables-converter

Add events
diff --git a/index.mdwn b/index.mdwn
index 550f8e3..3a1d8a9 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -33,3 +33,6 @@ In case you find any of these projects useful and you want to support work on th
 * [[development/Debugging]]
 * [[development/Gerrit]]
 * [[development/Install_as_non_Root]]
+
+### Events ###
+* [[hepl|HEPL]]

Add hepl
diff --git a/hepl.mdwn b/hepl.mdwn
new file mode 100644
index 0000000..e501ba9
--- /dev/null
+++ b/hepl.mdwn
@@ -0,0 +1,11 @@
+# Hacking Erpel
+
+Hacking Erpel (short HEPL) is a currently irregular Free Software
+Hacking event happening between Bonn and Koblenz in [Erpel][].
+
+[[!map pages="hepl/* and ! hepl/*/*"]]
+
+There's a [mailing list][] too that will get announcements of upcoming HEPLs.
+
+[Erpel]: https://de.wikipedia.org/wiki/Erpel
+[mailing list]: https://lists.sigxcpu.org/mailman/listinfo/hepl
diff --git a/hepl/hepl0.mdwn b/hepl/hepl0.mdwn
new file mode 100644
index 0000000..d75492b
--- /dev/null
+++ b/hepl/hepl0.mdwn
@@ -0,0 +1,8 @@
+# HEPL0
+
+* When: 2015-07-13
+* Number of patricipants: 6
+* Number of Tofu sausages: *unknown*
+* Number of Debian Bugs fixed: *unknown*
+
+
diff --git a/hepl/hepl1.mdwn b/hepl/hepl1.mdwn
new file mode 100644
index 0000000..b1b27ff
--- /dev/null
+++ b/hepl/hepl1.mdwn
@@ -0,0 +1,24 @@
+# HEPL1
+
+* When: *2015-10-31*
+* Number of patricipants: *5*
+* Bowls of Chilli Con Soja: *1*
+* Mates drank: *0*
+* Number of Debian Bugs fixed: *2*
+* Files transferred via XMPP: *2*
+
+Some things that happened:
+
+* Uploaded a new version of [iptables-converter][]
+* Fixed icedove's RC bug [#802281][]
+* Uploaded [libvirt][] 1.2.21-rc1 to experimental
+* Finally uploaded a first version of [zarafa][] to experimental
+* Worked on improved apache suppot for [zarafa-webapp][]
+* Updates to python-selenium & selenium-firefoxdriver (not yet uploaded)
+
+[iptables-converter]: https://packages.debian.org/source/sid/iptables-converter
+[#802281]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802281
+[libvirt]: https://packages.debian.org/source/experimental/libvirt
+[zarafa]: https://ftp-master.debian.org/new/zarafa_7.2.1~RC51272+dfsg1-1.html
+[zarafa-webapp]: https://github.com/tijuca/zarafa-webapp
+

Ignore emacs backup files
diff --git a/.gitignore b/.gitignore
index b84c806..a8764b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /.ikiwiki
 /recentchanges
+*~

Update gbp-rpm status
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index d11db06..24b4526 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -48,7 +48,7 @@ Here's my current [[gbp.conf]].
 ## Related Tools
 * [Git-pbuilder][0] by Russ Allbery is included in gbp but a newer version might be available.
 * [Chef Cookbook for gbp][1]
-* [git-buildpackage-rpm][2] by Markus Lehtonen. A fork of gbp adding RPM support. Aim is to integrate this back into gbp.
+* [git-buildpackage-rpm][2] by Markus Lehtonen. A fork of gbp adding RPM support. Large parts merged into gbp already.
 
 ## Todo
 * templating for gbp dch ([[!debbug 536719]]. [[!debbug 529332]])

Add missing source
diff --git a/development/install_as_non_root.mdwn b/development/install_as_non_root.mdwn
index eb33096..d991f9d 100644
--- a/development/install_as_non_root.mdwn
+++ b/development/install_as_non_root.mdwn
@@ -24,6 +24,8 @@ the libraries into a location where other tools can setp on it
 Use bundler to pull Gems from [rubygems.org](http://rubygems.org). The *Gemfile*
 describes what you want to pull in:
 
+    source 'https://rubygems.org'
+
     group :development, :test do
       gem 'puppetlabs_spec_helper',  :require => false
       gem 'puppet-lint',             :require => false

Update status of IIO and WLAN
diff --git a/hw/sony-SVD1321X9EW.mdwn b/hw/sony-SVD1321X9EW.mdwn
index b4a7d3e..def990d 100644
--- a/hw/sony-SVD1321X9EW.mdwn
+++ b/hw/sony-SVD1321X9EW.mdwn
@@ -24,19 +24,18 @@ Current status of hardware support on the Sony Vaio Duo 13" using Debian/Sid wit
     * usb 12d1:1573
     * needs recent MM and libqmi-glib (checked git HEAD at 2014-01-26)
     * ~~[Debian Bug][3]~~
-* WLAN works somewhat
+* WLAN *works*
     * Broadcom BCM4324
     * slow
     * needs CONFIG_BRCMFMAC, CONFIG_BRCMFMAC_SDIO
     * ~~[Debian Bug][1]~~
-    * Works with ifup/down, doesn't work with NM due to different interfaces
-      being used. Needs further investigation.
+    * Works with Network-manager and ifup/down as of Linux 4.1.0
 * NFC not tested yet
 * GPS not detected yet
-* Rotation-Sensor/Accelerometer doet not work
-    * detecte as iio device (/sys/bus/iio/devices but not HID events
-      (missing firmware?)
+* Rotation-Sensor/Accelerometer *works*
+    * detected as iio device (/sys/bus/iio/devices
     * needs CONFIG_I2C_HID,CONFIG_I2C_DESIGNWARE_PLATFORM
+	* Handled via iio-sensor-proxy
 * Bluetooth not tested yet
 * SD-Card slot works
 

Add zarafa tour talk
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index ddc1dd2..e5614ef 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,5 +1,7 @@
 ### Talks
 
+[Debian - 22 years and counting](http://honk.sigxcpu.org/talks/2015-09-zarafa/) at [Zarafa Tour 2015](https://www.zarafa.com/register-for-zarafa-tour-2015-the-netherlands-edition/), Woubrugge near Amsterdam, Netherlands, 2015
+
 [[Git-buildpackage BoF|https://git.sigxcpu.org/cgit/talks/2015-08-debconf15-gbp/plain/topics.pdf]] at [[DebConf 15|https://summit.debconf.org/debconf15/meeting/315/git-buildpackage-bof/]] Heidelberg, Germany 2015 ([video][6])
 
 [[Debian Pakete in Git entwicklen|https://honk.sigxcpu.org/gitweb/?p=talks/2015-01-12-fsfe-bonn_deb%2Bgit.git;a=blob_plain;f=gbp.pdf]] at FSFE Fellowship Meeting, Bonn, Germany 2015

Link video too
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index d226207..ddc1dd2 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,6 +1,6 @@
 ### Talks
 
-[[Git-buildpackage BoF|https://git.sigxcpu.org/cgit/talks/2015-08-debconf15-gbp/plain/topics.pdf]] at [[DebConf 15|https://summit.debconf.org/debconf15/meeting/315/git-buildpackage-bof/]] Heidelberg, Germany 2015
+[[Git-buildpackage BoF|https://git.sigxcpu.org/cgit/talks/2015-08-debconf15-gbp/plain/topics.pdf]] at [[DebConf 15|https://summit.debconf.org/debconf15/meeting/315/git-buildpackage-bof/]] Heidelberg, Germany 2015 ([video][6])
 
 [[Debian Pakete in Git entwicklen|https://honk.sigxcpu.org/gitweb/?p=talks/2015-01-12-fsfe-bonn_deb%2Bgit.git;a=blob_plain;f=gbp.pdf]] at FSFE Fellowship Meeting, Bonn, Germany 2015
 
@@ -43,3 +43,4 @@ M. Dreher, D. Fischer, K. Franzrahe, G. Günther, P. Henseler, J. Hoffmann, W. S
 [3]: http://wiki.debian.org/Groupware#Meeting
 [4]: http://blogs.fsfe.org/fellowship-interviews/?p=547
 [5]: http://twit.tv/show/floss-weekly/213
+[6]: http://ftp.acc.umu.se/pub/debian-meetings/2015/debconf15/Gitbuildpackage_BoF.webm

Add Debconf BoF
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index ad35933..d226207 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,5 +1,7 @@
 ### Talks
 
+[[Git-buildpackage BoF|https://git.sigxcpu.org/cgit/talks/2015-08-debconf15-gbp/plain/topics.pdf]] at [[DebConf 15|https://summit.debconf.org/debconf15/meeting/315/git-buildpackage-bof/]] Heidelberg, Germany 2015
+
 [[Debian Pakete in Git entwicklen|https://honk.sigxcpu.org/gitweb/?p=talks/2015-01-12-fsfe-bonn_deb%2Bgit.git;a=blob_plain;f=gbp.pdf]] at FSFE Fellowship Meeting, Bonn, Germany 2015
 
 [[Debian LTS/Shared Library Security Updates|https://honk.sigxcpu.org/gitweb/?p=talks/2014-09-08-fsfe-debian-lts-whatmaps.git;a=blob_plain;f=talk.pdf]] at FSFE Fellowship Meeting, Bonn, Germany 2014

Using merkur-board with tunslip6
diff --git a/hw/merkur-board.mdwn b/hw/merkur-board.mdwn
index d10b6d4..76b8696 100644
--- a/hw/merkur-board.mdwn
+++ b/hw/merkur-board.mdwn
@@ -19,6 +19,7 @@ Once flushed the board can be run on [battery power][3].
 * [Details on the different pinouts][4]
 * [Details on how to flash the device][5] with avrdude
 * The plant moisture sensor connects to [A5][6]
+* [Find A5][] on the Grove Board
 
 Compiling works like
 
@@ -70,6 +71,25 @@ when using a Raspberry Pi as described in [[here|rpi6lowpan]], I can't ping the
 board on it's link local address yet. I can also verify that it detects the
 RIPL router but the device is still not reachable.
 
+So let's for now use a second merkur board as [edge-router][].
+
+    $ sudo ./tunslip6 -s /dev/ttyUSB4 -B 38400 2001:DB8:c001:f00d::1/64
+    $ ping6 -c 1 2001:db8:c001:f00d:221:2eff:ff00:347c
+    PING 2001:db8:c001:f00d:221:2eff:ff00:347c(2001:db8:c001:f00d:221:2eff:ff00:347c) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
+    64 bytes from 2001:db8:c001:f00d:221:2eff:ff00:347c: icmp_seq=1 ttl=63 time=201 ms
+    --- 2001:db8:c001:f00d:221:2eff:ff00:347c ping statistics ---
+    1 packets transmitted, 1 received, 0% packet loss, time 0ms
+    rtt min/avg/max/mdev = 201.620/201.620/201.620/0.000 ms
+    $ ./coap-client -m get coap://[2001:db8:c001:f00d:221:2eff:ff00:347c]/.well-known/core
+    v:1 t:CON c:GET i:8ecd {} [ ]
+    </.well-known/core>;ct=40,</moisture/v>;title="Moisture voltage"v:1 t:CON c:GET i:8ece {} [ ]
+    ;rt=UCUM:"V";ct="0 5"
+
+We can now query the moisture sensor using [libcoap]:
+
+    $ ./coap-client -m get coap://[2001:db8:c001:f00d:221:2eff:ff00:347c]/moisture/v
+
+
 [0]: http://osdwiki.open-entry.com/doku.php/de:projekte:merkur
 [1]: http://osdwiki.open-entry.com/doku.php/de:projekte:plant_observation_kit
 [2]: http://osdwiki.open-entry.com/doku.php/de:tutorials:first_steps_arduino_ide
@@ -80,4 +100,6 @@ RIPL router but the device is still not reachable.
 [7]: http://www.meetup.com/IoT-Vienna/events/181968432/
 [Prolific Pinout]: https://jethomson.files.wordpress.com/2010/02/ca-42_dku-5_pinout.jpg
 [8]: http://www.open-entry.com/coxcoon/de/Zubehoer/FTDI-Basic-Breakout-3-3V.html
-
+[edge-router]: http://osdwiki.open-entry.com/doku.php/de:tutorials:contiki:merkur_board_rpl_usb_router
+[Find A5]: http://osdwiki.open-entry.com/doku.php/de:products:merkur_grove_board_4
+[libcoap]: http://sourceforge.net/projects/libcoap/

Some progress on the merkur-board
diff --git a/hw/merkur-board.mdwn b/hw/merkur-board.mdwn
index 93bb27d..d10b6d4 100644
--- a/hw/merkur-board.mdwn
+++ b/hw/merkur-board.mdwn
@@ -27,9 +27,9 @@ Compiling works like
     cd ./osd-contiki/examples/osd/arduino-plantobserving
     ./run.sh
 
-The build software can then be flushed to the device.  Note that it used
-/dev/ttyUSB0 by default. This needs to be adjusted. But currently when trying
-the flash the merkur-board I'm only seeing
+The build software can then be flushed to the device.  Note that it uses
+/dev/ttyUSB0 by default. This needs to be adjusted. When trying the flash the
+merkur-board with the usual USB-serial converter I see:
 
 	$ sudo apt-get install avrdude
 	$ cd osd-contiki/examples/osd/arduino-plantobserving
@@ -54,8 +54,21 @@ the flash the merkur-board I'm only seeing
 	Makefile:88: recipe for target 'flash' failed
 	make: *** [flash] Error 1
 
-even if I [ground the reset pin][7] (Pin 3).
+even if I [ground the reset pin][7] (Pin 3). However if I use a [*FTDI basic
+breakout*][8] flashing works as expected:
 
+	....
+
+The flashed firmware uses *channel 26* and *pan_id 0xabcd* by default.  This can
+be seen on the serial output (you can use the same serial converter as for
+flashing). To read the serial console I've so far used the serial console
+window from the arduino ide since *screen* doesn't support the 14400 baud used
+by the merkur-board.
+
+While I'm seeing packages looking for a RIPL router send by the merkur-board
+when using a Raspberry Pi as described in [[here|rpi6lowpan]], I can't ping the
+board on it's link local address yet. I can also verify that it detects the
+RIPL router but the device is still not reachable.
 
 [0]: http://osdwiki.open-entry.com/doku.php/de:projekte:merkur
 [1]: http://osdwiki.open-entry.com/doku.php/de:projekte:plant_observation_kit
@@ -66,3 +79,5 @@ even if I [ground the reset pin][7] (Pin 3).
 [6]: http://osdwiki.open-entry.com/doku.php/de:products:merkur_grove_board_4#steckerbelegung
 [7]: http://www.meetup.com/IoT-Vienna/events/181968432/
 [Prolific Pinout]: https://jethomson.files.wordpress.com/2010/02/ca-42_dku-5_pinout.jpg
+[8]: http://www.open-entry.com/coxcoon/de/Zubehoer/FTDI-Basic-Breakout-3-3V.html
+

We also need to "ifconfig lowpan0 up"
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index f6e0355..c69f425 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -179,17 +179,18 @@ Now we have all the tools:
 
 Make sure there's no ifplugd that brings the interface up. Kill it,
 if it's there. Then make sure the interface is down, set a pan_id and
-and add create the 6LoWPAN interfade:
+and add create the 6LoWPAN interface:
 
     $ kill $(ps awux | grep "[i]fplugd.*wpan0" | awk '{print $2}')
     $ ifconfig wpan0 | grep -qs UP && ifconfig wpan0 down
     $ src/iwpan dev wpan0 set pan_id 0xbeef
     $ ip link add link wpan0 name lowpan0 type lowpan
     $ ifconfig wpan0 up
+    $ ifconfig lowpan0 up
 
 You can now (hopefully) ping the other device:
 
-    $ ping6 -I lowpan0 fe80::f836:9287:905c:a684
+    $ ping6 fe80::f836:9287:905c:a684%lowpan0
     PING fe80::f836:9287:905c:a684(fe80::f836:9287:905c:a684) from fe80::cb23:b779:742d:4fd2 lowpan0: 56 data bytes
     64 bytes from fe80::f836:9287:905c:a684: icmp_seq=4 ttl=64 time=16.6 ms
     64 bytes from fe80::f836:9287:905c:a684: icmp_seq=11 ttl=64 time=30.6 ms

Duplication
diff --git a/hw/merkur-board.mdwn b/hw/merkur-board.mdwn
index 00c4048..93bb27d 100644
--- a/hw/merkur-board.mdwn
+++ b/hw/merkur-board.mdwn
@@ -27,14 +27,11 @@ Compiling works like
     cd ./osd-contiki/examples/osd/arduino-plantobserving
     ./run.sh
 
-The build software can then be flushed to the device
+The build software can then be flushed to the device.  Note that it used
+/dev/ttyUSB0 by default. This needs to be adjusted. But currently when trying
+the flash the merkur-board I'm only seeing
 
-    sudo ./flash.sh
-
-Not that it used /dev/ttyUSB0 by default. This needs to be adjusted.
-Currently when trying the flash the merkur-board I'm only seeing
-
-    $ sudo apt-get install avrdude
+	$ sudo apt-get install avrdude
 	$ cd osd-contiki/examples/osd/arduino-plantobserving
 	$ ./flash.sh /dev/ttyUSB4
 	INFO: compiling with CoAP-13

Add compilation notes
diff --git a/hw/merkur-board.mdwn b/hw/merkur-board.mdwn
index a9f2853..00c4048 100644
--- a/hw/merkur-board.mdwn
+++ b/hw/merkur-board.mdwn
@@ -20,8 +20,21 @@ Once flushed the board can be run on [battery power][3].
 * [Details on how to flash the device][5] with avrdude
 * The plant moisture sensor connects to [A5][6]
 
-But currently when trying the flash the merkur-board I'm only seeing
+Compiling works like
 
+    apt-get install avr-libc binutils-avr gcc-avr gdb-avr simulavr avrdude doxygen
+    git clone https://github.com/osdomotics/osd-contiki
+    cd ./osd-contiki/examples/osd/arduino-plantobserving
+    ./run.sh
+
+The build software can then be flushed to the device
+
+    sudo ./flash.sh
+
+Not that it used /dev/ttyUSB0 by default. This needs to be adjusted.
+Currently when trying the flash the merkur-board I'm only seeing
+
+    $ sudo apt-get install avrdude
 	$ cd osd-contiki/examples/osd/arduino-plantobserving
 	$ ./flash.sh /dev/ttyUSB4
 	INFO: compiling with CoAP-13

Add image
diff --git a/hw/merkur-board/merkur-board.jpg b/hw/merkur-board/merkur-board.jpg
new file mode 100644
index 0000000..8523db6
Binary files /dev/null and b/hw/merkur-board/merkur-board.jpg differ

Add some merkur-board docs
even though it doesn't flash contiki yet.
diff --git a/hw/merkur-board.mdwn b/hw/merkur-board.mdwn
new file mode 100644
index 0000000..a9f2853
--- /dev/null
+++ b/hw/merkur-board.mdwn
@@ -0,0 +1,58 @@
+# 6LowPAN with the Merkur-Board
+
+In for the [[rpi6lowpan]] to be actually usefull it needs to talk to
+some sensors. The [Merkur Board][0] is open hardware:
+
+[[!img merkur-board.jpg size="x150" alt="Merkur-Board"]]
+
+It has digital outputs as well as digital, analog and PWM outputs and
+supports attaching Arduino Grove Modules which should make experiments
+simple.  In order to test thinks I use the
+[Plant Oberservation Kit][1] set.
+
+One uses USB-Serial converter to flash the device. Details on how to
+connect it are [here][2]. Once the converter is attached to the board
+it's LED starts to blink (in my case 4 times short, one time long).
+
+Once flushed the board can be run on [battery power][3].
+
+* [Details on the different pinouts][4]
+* [Details on how to flash the device][5] with avrdude
+* The plant moisture sensor connects to [A5][6]
+
+But currently when trying the flash the merkur-board I'm only seeing
+
+	$ cd osd-contiki/examples/osd/arduino-plantobserving
+	$ ./flash.sh /dev/ttyUSB4
+	INFO: compiling with CoAP-13
+	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB4 -b57600 -e -U \
+    flash:w:arduino-example.osd-merkur.hex:a -U \
+    eeprom:w:arduino-example.osd-merkur.eep:a
+	avrdude: stk500_getsync() attempt 1 of 10: not in sync: resp=0x72
+	avrdude: stk500_getsync() attempt 2 of 10: not in sync: resp=0x6c
+	avrdude: stk500_getsync() attempt 3 of 10: not in sync: resp=0xc0
+	avrdude: stk500_getsync() attempt 4 of 10: not in sync: resp=0x72
+	avrdude: stk500_getsync() attempt 5 of 10: not in sync: resp=0x6c
+	avrdude: stk500_getsync() attempt 6 of 10: not in sync: resp=0xc0
+	avrdude: stk500_getsync() attempt 7 of 10: not in sync: resp=0x72
+	avrdude: stk500_getsync() attempt 8 of 10: not in sync: resp=0x6c
+	avrdude: stk500_getsync() attempt 9 of 10: not in sync: resp=0x72
+	avrdude: stk500_getsync() attempt 10 of 10: not in sync: resp=0x6c
+
+	avrdude done.  Thank you.
+
+	Makefile:88: recipe for target 'flash' failed
+	make: *** [flash] Error 1
+
+even if I [ground the reset pin][7] (Pin 3).
+
+
+[0]: http://osdwiki.open-entry.com/doku.php/de:projekte:merkur
+[1]: http://osdwiki.open-entry.com/doku.php/de:projekte:plant_observation_kit
+[2]: http://osdwiki.open-entry.com/doku.php/de:tutorials:first_steps_arduino_ide
+[3]: http://osdwiki.open-entry.com/lib/exe/detail.php/de:ideen:merkurknoten.jpg?id=de%3Aideen%3Afirststepsmerkurboard
+[4]: http://osdwiki.open-entry.com/doku.php/de:projekte:merkur#pinouts
+[5]: http://osdwiki.open-entry.com/doku.php/en:projekte:bootloader?s[]=flash
+[6]: http://osdwiki.open-entry.com/doku.php/de:products:merkur_grove_board_4#steckerbelegung
+[7]: http://www.meetup.com/IoT-Vienna/events/181968432/
+[Prolific Pinout]: https://jethomson.files.wordpress.com/2010/02/ca-42_dku-5_pinout.jpg

Mention howto permanently disable ifplugd
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index 7997216..f6e0355 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -177,7 +177,7 @@ Now we have all the tools:
             cca_mode: 1
             tx_power: 0
 
-Make sure there's no ifplugd that brings the interface up.  Kill it,
+Make sure there's no ifplugd that brings the interface up. Kill it,
 if it's there. Then make sure the interface is down, set a pan_id and
 and add create the 6LoWPAN interfade:
 
@@ -197,7 +197,8 @@ You can now (hopefully) ping the other device:
     --- fe80::f836:9287:905c:a684 ping statistics ---
     67 packets transmitted, 8 received, 88% packet loss, time 66025ms
 
-I do have to figure out the reason for the massive packet loss.
+The packet loss reduces when moving the devices closer together. In order to permanently
+disable ifplugd you can edit */etc/default/ifplugd*.
 
 Upstream info on wpan-tools is at http://wpan.cakelab.org/
 

Add missing plugin name
diff --git a/development/gerrit.mdwn b/development/gerrit.mdwn
index 56dd44b..ebaf2f7 100644
--- a/development/gerrit.mdwn
+++ b/development/gerrit.mdwn
@@ -19,5 +19,5 @@ Retrigger the sync to a certain destination by adding any part of it's URL:
 
     GERRIT=localhost
     ssh -p 29418 $GERRIT gerrit plugin reload replication
-    ssh -p 29418 $GERRIT start --url foobar --all --wait
+    ssh -p 29418 $GERRIT replication start --url foobar --all --wait
 

Document mirror update
diff --git a/development/gerrit.mdwn b/development/gerrit.mdwn
index 19cbb01..56dd44b 100644
--- a/development/gerrit.mdwn
+++ b/development/gerrit.mdwn
@@ -12,3 +12,12 @@ Then rebuild the caches and check the project list:
 # Groups
 While older versions hat a drop down box to select whether it's a ldap or system
 group you need to prefix groups with *ldap/* in recent gerrit.
+
+# Retrigger a sync to a mirror
+
+Retrigger the sync to a certain destination by adding any part of it's URL:
+
+    GERRIT=localhost
+    ssh -p 29418 $GERRIT gerrit plugin reload replication
+    ssh -p 29418 $GERRIT start --url foobar --all --wait
+

Add image
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index 7747aa4..7997216 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -4,6 +4,8 @@ The aim is to get [6LoWPAN][1] running on a Raspberry Pi using a
 [Raspberry Pi 802.15.4 radio from openlabs][2] (based on the Atmel
 at86rf233) so we can later use it as a e.g. border router.
 
+[[!img rpiradio.jpg size="x150" alt="Raspberry Pi with 802.15.4 radio"]]
+
 The default Raspberry Pi kernel lacks support for recent
 [wpan-tools][3]. So we cross build a custom
 built kernel via tftp.
diff --git a/hw/rpi6lowpan/rpiradio.jpg b/hw/rpi6lowpan/rpiradio.jpg
new file mode 100644
index 0000000..5c48800
Binary files /dev/null and b/hw/rpi6lowpan/rpiradio.jpg differ

SPI not API
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index 4ab8ea5..7747aa4 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -141,7 +141,7 @@ Now that we can quickly change and build kernels lets move to the 6LoWPAN part.
 
 ### Configuring the kernel and patching the DTS
 In order to enable support for the at86rf233 and 802.15.14 radio we need to change
-some kernel configuration. Since the board is connected vie API we change the DTS
+some kernel configuration. Since the board is connected vie SPI we change the DTS
 so it gets properly detected. This is readily done in this git repo:
 
     $ cd linux-wpan-next

Setup 6lowpan link
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index 6c6a1f9..4ab8ea5 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -175,6 +175,28 @@ Now we have all the tools:
             cca_mode: 1
             tx_power: 0
 
+Make sure there's no ifplugd that brings the interface up.  Kill it,
+if it's there. Then make sure the interface is down, set a pan_id and
+and add create the 6LoWPAN interfade:
+
+    $ kill $(ps awux | grep "[i]fplugd.*wpan0" | awk '{print $2}')
+    $ ifconfig wpan0 | grep -qs UP && ifconfig wpan0 down
+    $ src/iwpan dev wpan0 set pan_id 0xbeef
+    $ ip link add link wpan0 name lowpan0 type lowpan
+    $ ifconfig wpan0 up
+
+You can now (hopefully) ping the other device:
+
+    $ ping6 -I lowpan0 fe80::f836:9287:905c:a684
+    PING fe80::f836:9287:905c:a684(fe80::f836:9287:905c:a684) from fe80::cb23:b779:742d:4fd2 lowpan0: 56 data bytes
+    64 bytes from fe80::f836:9287:905c:a684: icmp_seq=4 ttl=64 time=16.6 ms
+    64 bytes from fe80::f836:9287:905c:a684: icmp_seq=11 ttl=64 time=30.6 ms
+    64 bytes from fe80::f836:9287:905c:a684: icmp_seq=12 ttl=64 time=16.3 ms
+    --- fe80::f836:9287:905c:a684 ping statistics ---
+    67 packets transmitted, 8 received, 88% packet loss, time 66025ms
+
+I do have to figure out the reason for the massive packet loss.
+
 Upstream info on wpan-tools is at http://wpan.cakelab.org/
 
 [1]: https://en.wikipedia.org/wiki/6LoWPAN

Don't forget ./configure
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index 52d86ce..6c6a1f9 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -162,7 +162,7 @@ Head over to your RPi. We build the wpan-tools there since they're small:
 
     $ git clone https://github.com/linux-wpan/wpan-tools
     $ sudo apt-get install automake autotools-dev libltdl-dev libnl-genl-3-dev
-	$ cd wpan-tools && ./autogen.sh && make
+	$ cd wpan-tools && ./autogen.sh && ./configure && make
 
 Now we have all the tools:
 

We need autotools to build wpan-tools
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index 6447b22..52d86ce 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -161,7 +161,7 @@ Transfer the files to the TFTP server again as described above.
 Head over to your RPi. We build the wpan-tools there since they're small:
 
     $ git clone https://github.com/linux-wpan/wpan-tools
-    $ sudo apt-get install autotools-dev libltdl-dev libnl-genl-3-dev
+    $ sudo apt-get install automake autotools-dev libltdl-dev libnl-genl-3-dev
 	$ cd wpan-tools && ./autogen.sh && make
 
 Now we have all the tools:

Mention uboot-mkimage
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index 71be9c9..6447b22 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -128,8 +128,9 @@ then power on the RPi and once U-Boot starts do a
     $ bootz ${kernel_addr_r} - ${fdt_addr_r}
 
 #### Automate the boot
-Copy the above commands into a file called boot.src and do a
+Copy the above commands into a file called *boot.src* and do a
 
+    sudo apt-get install uboot-mkimage
     mkimage -A arm -O linux -T script -C none -n boot.scr -d boot.scr boot.scr.uimg
 
 move that to /boot on your Raspberry Pi. Booting will from now on

This order makes more sense
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index 066bd51..71be9c9 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -76,6 +76,15 @@ basic support):
     $ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- bcm2835_defconfig
     $ ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- chrt -i 0 make -j 4
 
+#### On the tftp server
+Move the necessary files to the tftp server (${TFT_IP} being the address of your tftp server):
+
+    $ TFTP_IP=192.168.1.1
+    $ scp bluetooth-next/arch/arm/boot/zImage ${TFTP_IP}:/tftpboot/rpi.img
+    $ scp bluetooth-next/arch/arm/boot/dts/bcm2835-rpi-b-plus.dtb ${TFTP_IP}:/tftpboot/
+
+If you're using another PI model copy the corresponding device tree (dtb) file
+
 ### U-Boot
 We want to boot the kernel using U-Boot so we can conveniently swap out kernels using TFTP.
 This is mostly copied from http://elinux.org/RPi_U-Boot .
@@ -87,29 +96,29 @@ Crossbuild U-Boot
     $ export PATH=~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin:$PATH
     $ export CROSS_COMPILE=/home/agx/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-
     $ export USE_PRIVATE_LIBGCC=yes
+	$ cd u-boot
     $ make rpi_defconfig
     $ make -j4 -s
 
 #### On the RPi
-Configure the RPi to use the just built U-Boot (${PI_IP} being the address of your Raspberry Pi):
+Now configure the RPi to use the just built U-Boot (${PI_IP} being the
+address of your Raspberry Pi). First on copy U-Boot to the Pi:
 
     $ PI_IP=192.168.1.2
-    $ echo "kernel=u-boot.bin" >> /boot/config.txt
-    $ scp u-boot/u-boot.bin root@${PI_IP}:/boot/u-boot.bin
-    $ reboot
+    $ scp u-boot.bin root@${PI_IP}:/boot/u-boot.bin
 
-#### On the tftp server
-Move the necessary files to the tftp server (${TFT_IP} being the address of your tftp server):
-
-    $ TFTP_IP=192.168.1.1
-    $ scp bluetooth-next/arch/arm/boot/zImage ${TFTP_IP}:/tftpboot/rpi.img
-    $ scp bluetooth-next/arch/arm/boot/dts/bcm2835-rpi-b-plus.dtb ${TFTP_IP}:/tftpboot/
+and on the Raspberry Pi boot it by default:
 
-If you're using another PI model copy the corresponding device tree (dtb) file
+    $ echo "kernel=u-boot.bin" >> /boot/config.txt
+    $ poweroff
 
 #### First Boot
 (Again mostly from  http://elinux.org/RPi_U-Boot). Attach to the serial
-console, once U-Boot starts do a
+console
+
+    $ screen /dev/ttyUSB<N> 115200
+
+then power on the RPi and once U-Boot starts do a
 
     $ setenv fdtfile bcm2835-rpi-b-plus.dtb
     $ setenv bootargs earlyprintk console=ttyAMA0 console=tty1 root=/dev/mmcblk0p2 rootwait
@@ -123,7 +132,8 @@ Copy the above commands into a file called boot.src and do a
 
     mkimage -A arm -O linux -T script -C none -n boot.scr -d boot.scr boot.scr.uimg
 
-move that to /boot on your pi. Booting will from now on happen automatically.
+move that to /boot on your Raspberry Pi. Booting will from now on
+happen automatically.
 
 ## 6LoWPAN
 Now that we can quickly change and build kernels lets move to the 6LoWPAN part.

Fix scp commands
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index 1faddbc..066bd51 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -91,18 +91,19 @@ Crossbuild U-Boot
     $ make -j4 -s
 
 #### On the RPi
-Configure the RPi to use the just built U-Boot
+Configure the RPi to use the just built U-Boot (${PI_IP} being the address of your Raspberry Pi):
 
     $ PI_IP=192.168.1.2
     $ echo "kernel=u-boot.bin" >> /boot/config.txt
-    $ scp $PI_IP:u-boot/u-boot.bin /boot/u-boot.bin
+    $ scp u-boot/u-boot.bin root@${PI_IP}:/boot/u-boot.bin
     $ reboot
 
 #### On the tftp server
-Move the necessary files to the tftp server
+Move the necessary files to the tftp server (${TFT_IP} being the address of your tftp server):
 
-    $ scp $PI_IP:bluetooth-next/arch/arm/boot/zImage rpi.img
-    $ scp $PI_IP:bluetooth-next/arch/arm/boot/dts/bcm2835-rpi-b-plus.dtb .
+    $ TFTP_IP=192.168.1.1
+    $ scp bluetooth-next/arch/arm/boot/zImage ${TFTP_IP}:/tftpboot/rpi.img
+    $ scp bluetooth-next/arch/arm/boot/dts/bcm2835-rpi-b-plus.dtb ${TFTP_IP}:/tftpboot/
 
 If you're using another PI model copy the corresponding device tree (dtb) file
 

Suggest usage of Linus tree
Thanks: Carsten Schoenert
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index 0eb8b9e..1faddbc 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -67,7 +67,9 @@ Lots of the examples are using the 32bit one so lets use this too:
     gcc version 4.8.3 20140106 (prerelease) (crosstool-NG linaro-1.13.1-4.8-2014.01 - Linaro GCC 2013.11)
 
 ### Crossbuild an upstream kernel for the RPi
-For 6LoWPAN the bluetooth-next true is a good starting point:
+For 6LoWPAN the bluetooth-next tree is a good starting point since it
+contains the latest WPAN code (as of 4.0 you can also use Linus Tree for
+basic support):
 
     $ git clone --depth=1 git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
     $ export PATH=~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin:$PATH

rpi6lowpan.mdwn: fixing up some typos
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index bd65d14..0eb8b9e 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -1,7 +1,7 @@
-# 6LoWPAN on a RaspberryPi
+# 6LoWPAN on a Raspberry Pi
 
-The aim is to get [6LoWPAN][1] running on a Rasberry Pi using a
-[Raspberry Pi 802.15.4 radio from openlabs][2] (based on the
+The aim is to get [6LoWPAN][1] running on a Raspberry Pi using a
+[Raspberry Pi 802.15.4 radio from openlabs][2] (based on the Atmel
 at86rf233) so we can later use it as a e.g. border router.
 
 The default Raspberry Pi kernel lacks support for recent
@@ -22,10 +22,10 @@ The source code of this page is available here:
 Send fixes.
 
 ## Setup the build environment and the RPi
-Since the kernel build would take a long time on the Rasberry Pi we're using a
+Since the kernel build would take a long time on the Raspberry Pi we're using a
 Debian System to crossbuild the kernel.
 
-### Prepare cross toolhchain for Debian Jessie + Sid
+### Prepare cross toolchain for Debian Jessie + Sid
 If you're running a RPi 2 you should be able to use the armhf
 toolchain provided by Debian already.
 
@@ -67,19 +67,19 @@ Lots of the examples are using the 32bit one so lets use this too:
     gcc version 4.8.3 20140106 (prerelease) (crosstool-NG linaro-1.13.1-4.8-2014.01 - Linaro GCC 2013.11)
 
 ### Crossbuild an upstream kernel for the RPi
-For 6LowPAN the bluethoth-next true is a good starting point:
+For 6LoWPAN the bluetooth-next true is a good starting point:
 
     $ git clone --depth=1 git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
     $ export PATH=~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin:$PATH
     $ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- bcm2835_defconfig
     $ ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- chrt -i 0 make -j 4
 
-### UBoot
-We want to boot the kernel using UBoot so we can conveniently swap out kernels using TFTP
+### U-Boot
+We want to boot the kernel using U-Boot so we can conveniently swap out kernels using TFTP.
 This is mostly copied from http://elinux.org/RPi_U-Boot .
 
 #### On the build host
-Crossbuild uboot
+Crossbuild U-Boot
 
     $ git clone --deth=1 git://git.denx.de/u-boot.git
     $ export PATH=~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin:$PATH
@@ -88,8 +88,8 @@ Crossbuild uboot
     $ make rpi_defconfig
     $ make -j4 -s
 
-#### On the RPI
-Configure the RPi to use the just built uboot
+#### On the RPi
+Configure the RPi to use the just built U-Boot
 
     $ PI_IP=192.168.1.2
     $ echo "kernel=u-boot.bin" >> /boot/config.txt
@@ -106,7 +106,7 @@ If you're using another PI model copy the corresponding device tree (dtb) file
 
 #### First Boot
 (Again mostly from  http://elinux.org/RPi_U-Boot). Attach to the serial
-console, once uboot starts do a
+console, once U-Boot starts do a
 
     $ setenv fdtfile bcm2835-rpi-b-plus.dtb
     $ setenv bootargs earlyprintk console=ttyAMA0 console=tty1 root=/dev/mmcblk0p2 rootwait
@@ -135,7 +135,7 @@ so it gets properly detected. This is readily done in this git repo:
     $ git fetch rpi-6lowpan
     $ git co -b rpi-6lowpan -b agx/rpi-6lowpan
 
-Now lets reubuild DTS and kernel
+Now lets rebuild DTS and kernel
 
     $ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- bcm2835_defconfig
     $ ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- chrt -i 0 make -j 4

Add references to the upstream sites
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
index 8127d3b..bd65d14 100644
--- a/hw/rpi6lowpan.mdwn
+++ b/hw/rpi6lowpan.mdwn
@@ -11,6 +11,16 @@ built kernel via tftp.
 In the following we assume the Raspberry Pi is at IP address 192.168.1.2 and
 does DHCP during boot.
 
+This is mostly a combination of information from different sites like
+[linux-wpan][3], [openlabs][4] and [eLinux.org][5]. For details head over to
+these sites. They have more details and less errors.
+
+The source code of this page is available here:
+
+    https://honk.sigxcpu.org/gitweb/?p=piki.git;a=summary
+
+Send fixes.
+
 ## Setup the build environment and the RPi
 Since the kernel build would take a long time on the Rasberry Pi we're using a
 Debian System to crossbuild the kernel.
@@ -35,7 +45,7 @@ toolchain provided by Debian already.
 I don't have a Model 2 yet so I we have to grab the toolchain externally.
 
 ### Linaro
-For the Rpi 1 B and B+ use the Linaro toolchain.
+For the Raspberry Pi 1B and 1B+ use the Linaro toolchain:
 
     $ cd ~
     $ git clone https://github.com/raspberrypi/tools
@@ -133,7 +143,7 @@ Now lets reubuild DTS and kernel
 
 Transfer the files to the TFTP server again as described above.
 
-### Build the linxu-wpan tools
+### Build the linux-wpan tools
 Head over to your RPi. We build the wpan-tools there since they're small:
 
     $ git clone https://github.com/linux-wpan/wpan-tools
@@ -156,3 +166,5 @@ Upstream info on wpan-tools is at http://wpan.cakelab.org/
 [1]: https://en.wikipedia.org/wiki/6LoWPAN
 [2]: http://openlabs.co/store/Raspberry-Pi-802.15.4-radio
 [3]: http://wpan.cakelab.org/
+[4]: http://openlabs.co/
+[5]: http://elinux.org/

6LowPAN on RPI
diff --git a/hw/rpi6lowpan.mdwn b/hw/rpi6lowpan.mdwn
new file mode 100644
index 0000000..8127d3b
--- /dev/null
+++ b/hw/rpi6lowpan.mdwn
@@ -0,0 +1,158 @@
+# 6LoWPAN on a RaspberryPi
+
+The aim is to get [6LoWPAN][1] running on a Rasberry Pi using a
+[Raspberry Pi 802.15.4 radio from openlabs][2] (based on the
+at86rf233) so we can later use it as a e.g. border router.
+
+The default Raspberry Pi kernel lacks support for recent
+[wpan-tools][3]. So we cross build a custom
+built kernel via tftp.
+
+In the following we assume the Raspberry Pi is at IP address 192.168.1.2 and
+does DHCP during boot.
+
+## Setup the build environment and the RPi
+Since the kernel build would take a long time on the Rasberry Pi we're using a
+Debian System to crossbuild the kernel.
+
+### Prepare cross toolhchain for Debian Jessie + Sid
+If you're running a RPi 2 you should be able to use the armhf
+toolchain provided by Debian already.
+
+    $ dpkg --add-architecture armhf
+    $ apt-get update
+    $ apt-get install make ncurses-dev gcc-arm-linux-gnueabihf build-essential
+
+    $ arm-linux-gnueabihf-gcc -v
+    Using built-in specs.
+    COLLECT_GCC=arm-linux-gnueabihf-gcc
+    COLLECT_LTO_WRAPPER=/usr/lib/gcc/arm-linux-gnueabihf/4.9/lto-wrapper
+    Target: arm-linux-gnueabihf
+    Configured with: ../src/configure -v --with-pkgversion=' 4.9.2-10' --with-bugurl=file:///usr/share/doc/gcc-4.9/README.Bugs --enable-languages=c,c++,fortran --prefix=/usr --program-suffix=-4.9 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.9 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --disable-libitm --disable-libquadmath --enable-plugin --with-system-zlib --enable-multiarch --disable-sjlj-exceptions --with-arch=armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-mode=thumb --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=arm-linux-gnueabihf --program-prefix=arm-linux-gnueabihf-
+    Thread model: posix
+    gcc version 4.9.2 ( 4.9.2-10)
+
+I don't have a Model 2 yet so I we have to grab the toolchain externally.
+
+### Linaro
+For the Rpi 1 B and B+ use the Linaro toolchain.
+
+    $ cd ~
+    $ git clone https://github.com/raspberrypi/tools
+    $ export PATH=~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin:$PATH
+
+If you clone to another location be sure to adjusts the PATHs below too.
+
+### The Linaro toolchain is 32bit and 64bit
+Lots of the examples are using the 32bit one so lets use this too:
+
+    $ apt-get install lib32stdc++6 lib32z1
+    $ arm-linux-gnueabihf-gcc -v
+    Using built-in specs.
+    COLLECT_GCC=arm-linux-gnueabihf-gcc
+    COLLECT_LTO_WRAPPER=/home/agx/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/../libexec/gcc/arm-linux-gnueabihf/4.8.3/lto-wrapper
+    Target: arm-linux-gnueabihf
+    Configured with: /cbuild/slaves/oorts/crosstool-ng/builds/arm-linux-gnueabihf-raspbian-linux/.build/src/gcc-linaro-4.8-2014.01/configure --build=i686-build_pc-linux-gnu --host=i686-build_pc-linux-gnu --target=arm-linux-gnueabihf --prefix=/cbuild/slaves/oorts/crosstool-ng/builds/arm-linux-gnueabihf-raspbian-linux/install --with-sysroot=/cbuild/slaves/oorts/crosstool-ng/builds/arm-linux-gnueabihf-raspbian-linux/install/arm-linux-gnueabihf/libc --enable-languages=c,c++,fortran --disable-multilib --enable-multiarch --with-arch=armv6 --with-tune=arm1176jz-s --with-fpu=vfp --with-float=hard --with-pkgversion='crosstool-NG linaro-1.13.1-4.8-2014.01 - Linaro GCC 2013.11' --with-bugurl=https://bugs.launchpad.net/gcc-linaro --enable-__cxa_atexit --enable-libmudflap --enable-libgomp --enable-libssp --with-gmp=/cbuild/slaves/oorts/crosstool-ng/builds/arm-linux-gnueabihf-raspbian-linux/.build/arm-linux-gnueabihf/build/static --with-mpfr=/cbuild/slaves/oorts/crosstool-ng/builds/arm-linux-gnueabihf-raspbian-linux/.build/arm-linux-gnueabihf/build/static --with-mpc=/cbuild/slaves/oorts/crosstool-ng/builds/arm-linux-gnueabihf-raspbian-linux/.build/arm-linux-gnueabihf/build/static --with-isl=/cbuild/slaves/oorts/crosstool-ng/builds/arm-linux-gnueabihf-raspbian-linux/.build/arm-linux-gnueabihf/build/static --with-cloog=/cbuild/slaves/oorts/crosstool-ng/builds/arm-linux-gnueabihf-raspbian-linux/.build/arm-linux-gnueabihf/build/static --with-libelf=/cbuild/slaves/oorts/crosstool-ng/builds/arm-linux-gnueabihf-raspbian-linux/.build/arm-linux-gnueabihf/build/static --enable-threads=posix --disable-libstdcxx-pch --enable-linker-build-id --enable-plugin --enable-gold --with-local-prefix=/cbuild/slaves/oorts/crosstool-ng/builds/arm-linux-gnueabihf-raspbian-linux/install/arm-linux-gnueabihf/libc --enable-c99 --enable-long-long --with-float=hard
+    Thread model: posix
+    gcc version 4.8.3 20140106 (prerelease) (crosstool-NG linaro-1.13.1-4.8-2014.01 - Linaro GCC 2013.11)
+
+### Crossbuild an upstream kernel for the RPi
+For 6LowPAN the bluethoth-next true is a good starting point:
+
+    $ git clone --depth=1 git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
+    $ export PATH=~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin:$PATH
+    $ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- bcm2835_defconfig
+    $ ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- chrt -i 0 make -j 4
+
+### UBoot
+We want to boot the kernel using UBoot so we can conveniently swap out kernels using TFTP
+This is mostly copied from http://elinux.org/RPi_U-Boot .
+
+#### On the build host
+Crossbuild uboot
+
+    $ git clone --deth=1 git://git.denx.de/u-boot.git
+    $ export PATH=~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin:$PATH
+    $ export CROSS_COMPILE=/home/agx/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-
+    $ export USE_PRIVATE_LIBGCC=yes
+    $ make rpi_defconfig
+    $ make -j4 -s
+
+#### On the RPI
+Configure the RPi to use the just built uboot
+
+    $ PI_IP=192.168.1.2
+    $ echo "kernel=u-boot.bin" >> /boot/config.txt
+    $ scp $PI_IP:u-boot/u-boot.bin /boot/u-boot.bin
+    $ reboot
+
+#### On the tftp server
+Move the necessary files to the tftp server
+
+    $ scp $PI_IP:bluetooth-next/arch/arm/boot/zImage rpi.img
+    $ scp $PI_IP:bluetooth-next/arch/arm/boot/dts/bcm2835-rpi-b-plus.dtb .
+
+If you're using another PI model copy the corresponding device tree (dtb) file
+
+#### First Boot
+(Again mostly from  http://elinux.org/RPi_U-Boot). Attach to the serial
+console, once uboot starts do a
+
+    $ setenv fdtfile bcm2835-rpi-b-plus.dtb
+    $ setenv bootargs earlyprintk console=ttyAMA0 console=tty1 root=/dev/mmcblk0p2 rootwait
+    $ usb start
+    $ dhcp ${kernel_addr_r} zImage
+    $ tftp ${fdt_addr_r} ${fdtfile}
+    $ bootz ${kernel_addr_r} - ${fdt_addr_r}
+
+#### Automate the boot
+Copy the above commands into a file called boot.src and do a
+
+    mkimage -A arm -O linux -T script -C none -n boot.scr -d boot.scr boot.scr.uimg
+
+move that to /boot on your pi. Booting will from now on happen automatically.
+
+## 6LoWPAN
+Now that we can quickly change and build kernels lets move to the 6LoWPAN part.
+
+### Configuring the kernel and patching the DTS
+In order to enable support for the at86rf233 and 802.15.14 radio we need to change
+some kernel configuration. Since the board is connected vie API we change the DTS
+so it gets properly detected. This is readily done in this git repo:
+
+    $ cd linux-wpan-next
+    $ git remote add agx git://github.com/agx/linux-wpan-next.git
+    $ git fetch rpi-6lowpan
+    $ git co -b rpi-6lowpan -b agx/rpi-6lowpan
+
+Now lets reubuild DTS and kernel
+
+    $ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- bcm2835_defconfig
+    $ ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- chrt -i 0 make -j 4
+    $ ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- make dtbs
+
+Transfer the files to the TFTP server again as described above.
+
+### Build the linxu-wpan tools
+Head over to your RPi. We build the wpan-tools there since they're small:
+
+    $ git clone https://github.com/linux-wpan/wpan-tools
+    $ sudo apt-get install autotools-dev libltdl-dev libnl-genl-3-dev
+	$ cd wpan-tools && ./autogen.sh && make
+
+Now we have all the tools:
+
+    $ src/iwpan list
+    wpan_phy phy0
+    supported channels:
+            page 0: 11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26
+            current_page: 0
+            current_channel: 13
+            cca_mode: 1
+            tx_power: 0
+
+Upstream info on wpan-tools is at http://wpan.cakelab.org/
+
+[1]: https://en.wikipedia.org/wiki/6LoWPAN
+[2]: http://openlabs.co/store/Raspberry-Pi-802.15.4-radio
+[3]: http://wpan.cakelab.org/

Change microblog link
diff --git a/index.mdwn b/index.mdwn
index 96e6ccb..550f8e3 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -23,7 +23,7 @@ In case you find any of these projects useful and you want to support work on th
 
 ### Blog ###
 * [Colors of Noise](http://honk.sigxcpu.org/con)
-* [Microblog](http://identi.ca/agx/)
+* [Microblog](https://twitter.com/GuidoGuenther)
 
 ### Development ###
 * [[development/HG_cheatsheet]]

Link from index
diff --git a/development/install_as_non_root.mdwn b/development/install_as_non_root.mdwn
new file mode 100644
index 0000000..eb33096
--- /dev/null
+++ b/development/install_as_non_root.mdwn
@@ -0,0 +1,81 @@
+# Developing as non root
+
+Many examples tell you to do things like
+
+    sudo python setup.py install
+
+or
+
+    sudo gem install foo
+
+or
+
+    ./configure --prefix=/
+    make install
+
+While this is o.k. if you know what you're doing and you give a crap
+about package management risking to break other scripts and tools by
+introducint new library versions it is often much better to not install
+the libraries into a location where other tools can setp on it
+(e.g. /usr/lib, /usr/bin or /usr/local/\*).
+
+## Ruby
+
+Use bundler to pull Gems from [rubygems.org](http://rubygems.org). The *Gemfile*
+describes what you want to pull in:
+
+    group :development, :test do
+      gem 'puppetlabs_spec_helper',  :require => false
+      gem 'puppet-lint',             :require => false
+      gem 'puppet',                  puppetversion, :require => false
+      gem 'rake', '~> 10.1.0',       :require => false
+      gem 'rspec-puppet',            :require => false
+      gem 'simplecov',               :require => false
+    end
+
+With that in place you can run
+
+    sudo apt-get install bundler
+    bundle install --path=vendor
+
+and it will fetch the gems and put them into vendor/. No cluttering of
+any directories outside your project. You can run commands from that via
+
+	bundle exec <cmd>
+
+e.g.
+
+    bundle exec rake spec
+
+## NodeJS
+
+npm
+
+## GNOME
+
+jhbuild
+
+## Generic C/C++ project
+
+For a limited set of libs you can do:
+
+    PREFIX=$PWD/../installed
+    ./configure --prefix=$PREFIX
+    make install
+    export LD_LIBRARY_PATH=$PREFIX
+
+see e.g. libplanfahr's ./run
+
+## Python
+
+For Python there's virtualenv
+
+    virtualenv newtestenv
+    source newtestenv/bin/activate
+
+From there on you can use the new environment already, e.g. install a module into it:
+
+    cd mymodule
+    python setup.py install
+
+This would install the module (along with it's dependenies) into you new *testenv*.
diff --git a/development/non_root.mdwn b/development/non_root.mdwn
deleted file mode 100644
index 755382d..0000000
--- a/development/non_root.mdwn
+++ /dev/null
@@ -1,81 +0,0 @@
-# Developing as non root
-
-Many example tell you to do things like
-
-    sudo python setup.py install
-
-or
-
-    sudo gem install foo
-
-or
-
-    ./configure --prefix=/
-    make install
-
-While this is o.k. if you know what you're doing and you give a crap
-about package management risking to break other scripts and tools by
-introducint new library versions it is often much better to not install
-the libraries into a location where other tools can setp on it
-(e.g. /usr/lib, /usr/bin or /usr/local/\*).
-
-## Ruby
-
-Use bundler to pull Gems from [rubygems.org](http://rubygems.org). The *Gemfile*
-describes what you want to pull in:
-
-    group :development, :test do
-      gem 'puppetlabs_spec_helper',  :require => false
-      gem 'puppet-lint',             :require => false
-      gem 'puppet',                  puppetversion, :require => false
-      gem 'rake', '~> 10.1.0',       :require => false
-      gem 'rspec-puppet',            :require => false
-      gem 'simplecov',               :require => false
-    end
-
-With that in place you can run
-
-    sudo apt-get install bundler
-    bundle install --path=vendor
-
-and it will fetch the gems and put them into vendor/. No cluttering of
-any directories outside your project. You can run commands from that via
-
-	bundle exec <cmd>
-
-e.g.
-
-    bundle exec rake spec
-
-## NodeJS
-
-npm
-
-## GNOME
-
-jhbuild
-
-## Generic C/C++ project
-
-For a limited set of libs you can do:
-
-    PREFIX=$PWD/../installed
-    ./configure --prefix=$PREFIX
-    make install
-    export LD_LIBRARY_PATH=$PREFIX
-
-see e.g. libplanfahr's ./run
-
-## Python
-
-For Python there's virtualenv
-
-    virtualenv newtestenv
-    source newtestenv/bin/activate
-
-From there on you can use the new environment already, e.g. install a module into it:
-
-    cd mymodule
-    python setup.py install
-
-This would install the module (along with it's dependenies) into you new *testenv*.
diff --git a/index.mdwn b/index.mdwn
index 7373cd9..96e6ccb 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -32,3 +32,4 @@ In case you find any of these projects useful and you want to support work on th
 * [[development/Debian packages in Git]]
 * [[development/Debugging]]
 * [[development/Gerrit]]
+* [[development/Install_as_non_Root]]

Details on virtualenv and bundler
diff --git a/development/non_root.mdwn b/development/non_root.mdwn
index 680d7ee..755382d 100644
--- a/development/non_root.mdwn
+++ b/development/non_root.mdwn
@@ -17,7 +17,7 @@ While this is o.k. if you know what you're doing and you give a crap
 about package management risking to break other scripts and tools by
 introducint new library versions it is often much better to not install
 the libraries into a location where other tools can setp on it
-(e.g. /usr/lib, /usr/bin or /usr/local/*).
+(e.g. /usr/lib, /usr/bin or /usr/local/\*).
 
 ## Ruby
 
@@ -39,7 +39,13 @@ With that in place you can run
     bundle install --path=vendor
 
 and it will fetch the gems and put them into vendor/. No cluttering of
-any directories outside your project.
+any directories outside your project. You can run commands from that via
+
+	bundle exec <cmd>
+
+e.g.
+
+    bundle exec rake spec
 
 ## NodeJS
 
@@ -58,4 +64,18 @@ For a limited set of libs you can do:
     make install
     export LD_LIBRARY_PATH=$PREFIX
 
-see e.g. liblanfahr's ./run
+see e.g. libplanfahr's ./run
+
+## Python
+
+For Python there's virtualenv
+
+    virtualenv newtestenv
+    source newtestenv/bin/activate
+
+From there on you can use the new environment already, e.g. install a module into it:
+
+    cd mymodule
+    python setup.py install
+
+This would install the module (along with it's dependenies) into you new *testenv*.

Mention git-buildpackage-rpm
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index a2f4950..d11db06 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -46,8 +46,9 @@ For enhancements and feature requests you can either use the [Debian bugtracking
 Here's my current [[gbp.conf]].
 
 ## Related Tools
-* [Git-pbuilder][0] by Russ Allbery is included in gbp but a newer version might be available. 
+* [Git-pbuilder][0] by Russ Allbery is included in gbp but a newer version might be available.
 * [Chef Cookbook for gbp][1]
+* [git-buildpackage-rpm][2] by Markus Lehtonen. A fork of gbp adding RPM support. Aim is to integrate this back into gbp.
 
 ## Todo
 * templating for gbp dch ([[!debbug 536719]]. [[!debbug 529332]])
@@ -62,3 +63,4 @@ git-buildpackage is free software and licensed under the GPL Version 2.
 
 [0]: http://www.eyrie.org/~eagle/software/scripts/git-pbuilder.html
 [1]: https://github.com/mlafeldt/gbp-cookbook
+[2]: https://github.com/marquiz/git-buildpackage-rpm

Add recent Gbp talk
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index 49a7721..ad35933 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,5 +1,7 @@
 ### Talks
 
+[[Debian Pakete in Git entwicklen|https://honk.sigxcpu.org/gitweb/?p=talks/2015-01-12-fsfe-bonn_deb%2Bgit.git;a=blob_plain;f=gbp.pdf]] at FSFE Fellowship Meeting, Bonn, Germany 2015
+
 [[Debian LTS/Shared Library Security Updates|https://honk.sigxcpu.org/gitweb/?p=talks/2014-09-08-fsfe-debian-lts-whatmaps.git;a=blob_plain;f=talk.pdf]] at FSFE Fellowship Meeting, Bonn, Germany 2014
 
 [[Debian 360°|2013-12-debian.pdf]] at [FSFE Fellowship Meeting](https://wiki.fsfe.org/FellowshipEvents/Fellowship%20Meeting%20Bonn%202013-12), Bonn, Germany, 2013

Start document explaining how to not clutter $system
diff --git a/development/non_root.mdwn b/development/non_root.mdwn
new file mode 100644
index 0000000..680d7ee
--- /dev/null
+++ b/development/non_root.mdwn
@@ -0,0 +1,61 @@
+# Developing as non root
+
+Many example tell you to do things like
+
+    sudo python setup.py install
+
+or
+
+    sudo gem install foo
+
+or
+
+    ./configure --prefix=/
+    make install
+
+While this is o.k. if you know what you're doing and you give a crap
+about package management risking to break other scripts and tools by
+introducint new library versions it is often much better to not install
+the libraries into a location where other tools can setp on it
+(e.g. /usr/lib, /usr/bin or /usr/local/*).
+
+## Ruby
+
+Use bundler to pull Gems from [rubygems.org](http://rubygems.org). The *Gemfile*
+describes what you want to pull in:
+
+    group :development, :test do
+      gem 'puppetlabs_spec_helper',  :require => false
+      gem 'puppet-lint',             :require => false
+      gem 'puppet',                  puppetversion, :require => false
+      gem 'rake', '~> 10.1.0',       :require => false
+      gem 'rspec-puppet',            :require => false
+      gem 'simplecov',               :require => false
+    end
+
+With that in place you can run
+
+    sudo apt-get install bundler
+    bundle install --path=vendor
+
+and it will fetch the gems and put them into vendor/. No cluttering of
+any directories outside your project.
+
+## NodeJS
+
+npm
+
+## GNOME
+
+jhbuild
+
+## Generic C/C++ project
+
+For a limited set of libs you can do:
+
+    PREFIX=$PWD/../installed
+    ./configure --prefix=$PREFIX
+    make install
+    export LD_LIBRARY_PATH=$PREFIX
+
+see e.g. liblanfahr's ./run

Fix headline indentation
diff --git a/projects/krb5-auth-dialog.mdwn b/projects/krb5-auth-dialog.mdwn
index be1eae0..694db2c 100644
--- a/projects/krb5-auth-dialog.mdwn
+++ b/projects/krb5-auth-dialog.mdwn
@@ -4,7 +4,7 @@ Krb5-auth-dialog is a tray applet for the [GNOME](http://gnome.org) Desktop that
 
 [[!toc ]]
 
-### Features
+## Features
 
 * It can alert the user via [notifications](http://www.galago-project.org/specs/notification/) when the ticket is about to expire.
 * Tickets can be acquired by clicking on the tray icon.
@@ -21,18 +21,18 @@ Krb5-auth-dialog is a tray applet for the [GNOME](http://gnome.org) Desktop that
 
 [[!template  id=flattr thing="48094" name="krb5-auth-dialog"]]
 
-### Source Code
+## Source Code
 The source code is available and browseable via [GNOMEs GIT](http://git.gnome.org/cgit/krb5-auth-dialog/):
 
     git clone git://git.gnome.org/krb5-auth-dialog
 
-### Releases
+## Releases
 Releases are availale from [download.gnome.org](http://download.gnome.org/sources/krb5-auth-dialog/). The current stable release is [3.8.0](http://download.gnome.org/sources/krb5-auth-dialog/3.8/).
 
-### Debian Packages
+## Debian Packages
 Debian packges are available from [debian.org](http://packages.debian.org/search?keywords=krb5-auth-dialog).
 
-### Screenshots
+## Screenshots
 The tray icon can be seen [here](http://honk.sigxcpu.org/con/krb5_auth_dialog_updates.html) and [here](http://honk.sigxcpu.org/con/krb5_auth_dialog__new_icon.html). Below are pictures of the password and preferences dialogs:
 
 
@@ -48,7 +48,7 @@ The notifications under [GNOME 3][2] look like this:
 [[!img  notify-expired.png alt="expired ticket notification"]]
 </div>
 
-### Plugins
+## Plugins
 There are currently three plugins available:
 
 * afs - call aklog or afslog to aquire AFS tickets
@@ -57,12 +57,12 @@ There are currently three plugins available:
 
 These plugins can be activated using a [key in GSettings][0]
 
-### DBus API
+## DBus API
 * There's a DBus API to acquire Kerberos ticktes. See the [examples][1]. [virt-manager][] is using this and [here](http://honk.sigxcpu.org/unsorted-patches/offlineimap_acquire-tgt.diff)'s a patch for [offlineimap][].
 * DBus signals notify about acquired, renewed or expired tickets. This can be used to e.g. run [aklog](http://docs.openafs.org/Reference/1/aklog.html) via this [example](http://git.gnome.org/browse/krb5-auth-dialog/commit/?id=c374a7f8dbe6ef40c65752e3f35635d50d6b9260).
 
 
-### Todo
+## Todo
 * Add gnome keyring support ([567701](http://bugzilla.gnome.org/show_bug.cgi?id=567701))
 * Remove all wakeups, rely on our gio watch of the ticket cache
 * Add cache version, etc. to ticket dialog
@@ -73,11 +73,11 @@ These plugins can be activated using a [key in GSettings][0]
     * Evolution IMAP and SMTP
     * ssh client
 
-#### GNOME 3 Readiness
+### GNOME 3 Readiness
 * krb5-auth-dialog uses persistent notifications instead of a tray icon
 * Settings were moved from a stand alone dialog into the gnome-control-center panel
 
-##### GNOME Goals
+### GNOME Goals
 Status of current [Gnome goals][] in krb5-auth-dialog:
 
 * [Deprecated GLib symbols][] - done
@@ -89,13 +89,13 @@ Status of current [Gnome goals][] in krb5-auth-dialog:
 * [Migrate to GSettings / dconf][] - done
 * [Migrate to GDBus][] - done
 
-### Authors
+## Authors
 krb5-auth-dialog was originally written by Christopher Aillon and is now maintained by Guido Günther <<agx@sigxcpu.org>>.
 
-### Bugs
+## Bugs
 Please file bug reports via [GNOME's bugzilla][3].
 
-### License
+## License
 krb5-auth-dialog is free software and licensed under the GPL Version 2.
 
 [DBus]: http://dbus.freedesktop.org/

Bring up to par with other pages
diff --git a/projects/nss-dontstalkme.mdwn b/projects/nss-dontstalkme.mdwn
index 4d20ee6..16bc9ac 100644
--- a/projects/nss-dontstalkme.mdwn
+++ b/projects/nss-dontstalkme.mdwn
@@ -9,6 +9,8 @@ applications this affects the whole system.
 ## Installation
 See the README file in the source.
 
+[[!template  id=honk_git repo="nss-dontstalkme"]]
+
 ### Pre-built packages
 Debian Packages for Jessie can be found [here][].
 
@@ -24,6 +26,8 @@ This should return only addresses of localhost.
 ## TODO
 * Move blocked domains to config file?
 
+[[!template  id=honk_ml project="nss-dontstalkme"]]
+
 ## Author
 nss-dontstalkme was written by [[Guido Günther|/agx]].
 

Fix typo
diff --git a/projects/whatmaps.mdwn b/projects/whatmaps.mdwn
index 48fcbe7..a7043a5 100644
--- a/projects/whatmaps.mdwn
+++ b/projects/whatmaps.mdwn
@@ -66,7 +66,7 @@ Checkrestart in the [debian-goodies][] package detects processes that need to be
 * Try to runtime inspect python/perl/java for loaded modules using lsof or PTRACE_PEEKDATA
 * <s>Apt integration</s>
 * <s>Better Fedora support</s>
-* Support for other init systems (filerc, upstart) besides SysV-RC and sytemd
+* Support for other init systems (filerc, upstart) besides SysV-RC and systemd
 * DNF/Yum integration
 
 ## Author

Make headline levels match the other pages
so templates appear at the right level too
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index 02857ed..a2f4950 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -2,7 +2,7 @@ Suite to help with maintaining [Debian](http://www.debian.org) packages in [Git]
 
 [[!toc]]
 
-### Tools
+## Tools
 GBP ships the following tools:
 
 * *gbp import-{dsc,dscs}*: import existing Debian source packages into a git repository
@@ -22,7 +22,7 @@ There are some helpers in */usr/share/doc/git-buildpackage/examples/*:
 
 [[!template  id=flattr thing="48091" name="Git-buildpackage"]]
 
-### Documentation
+## Documentation
 * git-buildpackage's [official manual](http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.html).
 * A possible workflow for maintaining [[development/debian packages in git]].
 * The current [api documentation](http://honk.sigxcpu.org/projects/git-buildpackage/apidocs/) in case you want to extend git-buildpackage.
@@ -34,30 +34,30 @@ The usage of the *GitRepository* class is shown (and tested) in
 
 There's also a clone on [github](https://github.com/agx/git-buildpackage).
 
-### Debian packages
+## Debian packages
 Debian packages of git-buildpackage can be downloaded from the [[!debpkg git-buildpackage desc="Debian Archive"]]. Git snapshots are available [here](http://honk.sigxcpu.org:8001/job/git-buildpackage/).
 
-### Bugreports
+## Bugreports
 For enhancements and feature requests you can either use the [Debian bugtracking system](http://bugs.debian.org) or email [me](mailto:agx@sigxcpu.org) directly.
 
 [[!template  id=honk_ml project="git-buildpackage"]]
 
-### gbp.conf
+## gbp.conf
 Here's my current [[gbp.conf]].
 
-### Related Tools
+## Related Tools
 * [Git-pbuilder][0] by Russ Allbery is included in gbp but a newer version might be available. 
 * [Chef Cookbook for gbp][1]
 
-### Todo
+## Todo
 * templating for gbp dch ([[!debbug 536719]]. [[!debbug 529332]])
 * translate the manual
 * [[!debbug git-buildpackage desc="bugs"]] filed in the Debian bugtracking system
 
-### Author
+## Author
 git-buildpackage was written by [[Guido Günther|/agx]] with contributions from many individuals. See the changelog for attributions.
 
-### License
+## License
 git-buildpackage is free software and licensed under the GPL Version 2.
 
 [0]: http://www.eyrie.org/~eagle/software/scripts/git-pbuilder.html

Fix headline level
diff --git a/templates/honk_ml b/templates/honk_ml
index 8757659..36a5765 100644
--- a/templates/honk_ml
+++ b/templates/honk_ml
@@ -1,2 +1,2 @@
-### Mailing list
+## Mailing List
 <TMPL_VAR project> has it's own [mailing list](http://lists.sigxcpu.org/mailman/listinfo/<TMPL_VAR project>) for general discussion and patches.

Use template
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index 72ac3ae..02857ed 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -62,4 +62,3 @@ git-buildpackage is free software and licensed under the GPL Version 2.
 
 [0]: http://www.eyrie.org/~eagle/software/scripts/git-pbuilder.html
 [1]: https://github.com/mlafeldt/gbp-cookbook
-[mailing list]: http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage
diff --git a/projects/munin-pelletronic.mdwn b/projects/munin-pelletronic.mdwn
index dedfcf5..4e5d06d 100644
--- a/projects/munin-pelletronic.mdwn
+++ b/projects/munin-pelletronic.mdwn
@@ -43,8 +43,7 @@ Pelletronic firmware:
 
 * Touch V2.03 20140723
 
-## Mailing List
-Munin-pelletronic has it's own [mailing list][].
+[[!template  id=honk_ml project="munin-pelletronic"]]
 
 ## Author
 munin-pelletronic was written by [[Guido Günther|/agx]].
@@ -54,4 +53,3 @@ munin-pelletronic is free software and licensed under the GPL Version 3.
 
 
 [1]: http://munin-monitoring.org/
-[mailing list]: https://lists.sigxcpu.org/mailman/listinfo/munin-pelletronic
diff --git a/projects/whatmaps.mdwn b/projects/whatmaps.mdwn
index 6076895..48fcbe7 100644
--- a/projects/whatmaps.mdwn
+++ b/projects/whatmaps.mdwn
@@ -72,12 +72,10 @@ Checkrestart in the [debian-goodies][] package detects processes that need to be
 ## Author
 whatmaps was written by [[Guido Günther|/agx]].
 
-## Mailing List
-Whatmaps has it's own [mailing list][].
+[[!template  id=honk_ml project="whatmaps"]]
 
 ## License
 whatmaps is free software and licensed under the GPL Version 3.
 
 [here]: /projects/whatmaps/releases/
 [debian-goodies]: http://packages.debian.org/debian-goodies
-[mailing list]: https://lists.sigxcpu.org/mailman/listinfo/whatmaps

Use template
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index 96d2882..72ac3ae 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -40,8 +40,7 @@ Debian packages of git-buildpackage can be downloaded from the [[!debpkg git-bui
 ### Bugreports
 For enhancements and feature requests you can either use the [Debian bugtracking system](http://bugs.debian.org) or email [me](mailto:agx@sigxcpu.org) directly.
 
-## Mailing List
-git-buildpackage has it's own [mailing list][].
+[[!template  id=honk_ml project="git-buildpackage"]]
 
 ### gbp.conf
 Here's my current [[gbp.conf]].
diff --git a/templates/honk_ml b/templates/honk_ml
new file mode 100644
index 0000000..8757659
--- /dev/null
+++ b/templates/honk_ml
@@ -0,0 +1,2 @@
+### Mailing list
+<TMPL_VAR project> has it's own [mailing list](http://lists.sigxcpu.org/mailman/listinfo/<TMPL_VAR project>) for general discussion and patches.

Fix cut and paste error
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index 20fc9af..96d2882 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -41,7 +41,7 @@ Debian packages of git-buildpackage can be downloaded from the [[!debpkg git-bui
 For enhancements and feature requests you can either use the [Debian bugtracking system](http://bugs.debian.org) or email [me](mailto:agx@sigxcpu.org) directly.
 
 ## Mailing List
-Whatmaps has it's own [mailing list][].
+git-buildpackage has it's own [mailing list][].
 
 ### gbp.conf
 Here's my current [[gbp.conf]].

Mention mailing list
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index 1cfcceb..20fc9af 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -40,6 +40,9 @@ Debian packages of git-buildpackage can be downloaded from the [[!debpkg git-bui
 ### Bugreports
 For enhancements and feature requests you can either use the [Debian bugtracking system](http://bugs.debian.org) or email [me](mailto:agx@sigxcpu.org) directly.
 
+## Mailing List
+Whatmaps has it's own [mailing list][].
+
 ### gbp.conf
 Here's my current [[gbp.conf]].
 
@@ -60,4 +63,4 @@ git-buildpackage is free software and licensed under the GPL Version 2.
 
 [0]: http://www.eyrie.org/~eagle/software/scripts/git-pbuilder.html
 [1]: https://github.com/mlafeldt/gbp-cookbook
-
+[mailing list]: http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage

Add twitter and github
diff --git a/agx.mdwn b/agx.mdwn
index c7b44ae..ad78c65 100644
--- a/agx.mdwn
+++ b/agx.mdwn
@@ -4,5 +4,6 @@
 * Jabber: agx@sigxcpu.org
 * List of [[Publications]] (talks, papers, etc.)
 * [Blog](http://honk.sigxcpu.org/con)
-* [Microblog](http://identi.ca/agx/)
+* [Microblog/Twitter](https://twitter.com/GuidoGuenther)
 * [Ohloh](http://www.ohloh.net/accounts/agx)
+* [github](http://github.com/agx)

Add disclaimer
diff --git a/projects/munin-pelletronic.mdwn b/projects/munin-pelletronic.mdwn
index a92f54e..dedfcf5 100644
--- a/projects/munin-pelletronic.mdwn
+++ b/projects/munin-pelletronic.mdwn
@@ -8,6 +8,14 @@ switches.
 The plugins simply query the Pelletronic's web interface so this has to be
 enabled and working.
 
+*Disclaimer*: The plugin was written by looking at the web frontend's
+ HTTP requests so there might be errors. Use at your own risk. Always
+ refer to Oekofen's official web frontend to be sure.
+ 
+ Neither these plugins nor me are in any way related to Oekofen so
+ don't bother Oekofen's support about them, use the mailing list below
+ instead.
+
 [[!toc ]]
 
 ## Features
@@ -30,6 +38,9 @@ See the README document in the sources.
 
 ## Tested Versions
 
+THe plugins were tested against these releases of Oekofen's
+Pelletronic firmware:
+
 * Touch V2.03 20140723
 
 ## Mailing List

Improve layout
diff --git a/projects/munin-pelletronic.mdwn b/projects/munin-pelletronic.mdwn
index 6b2f9e2..a92f54e 100644
--- a/projects/munin-pelletronic.mdwn
+++ b/projects/munin-pelletronic.mdwn
@@ -8,6 +8,8 @@ switches.
 The plugins simply query the Pelletronic's web interface so this has to be
 enabled and working.
 
+[[!toc ]]
+
 ## Features
 It can graph and monitor:
 
@@ -16,7 +18,9 @@ It can graph and monitor:
 * Various Pumps and switches
 * Runtime
 
-[[!toc ]]
+<div class="screenshots">
+[[!img  pellematic_switches-week.png alt="Graph of pellematic switches "]]
+</div>
 
 ## Installation
 See the README document in the sources.
@@ -28,10 +32,6 @@ See the README document in the sources.
 
 * Touch V2.03 20140723
 
-<div class="screenshots">
-[[!img  pellematic_switches-week.png alt="Graph of pellematic switches "]]
-</div>
-
 ## Mailing List
 Munin-pelletronic has it's own [mailing list][].
 

Fix size
diff --git a/projects/munin-pelletronic.mdwn b/projects/munin-pelletronic.mdwn
index 50117b5..6b2f9e2 100644
--- a/projects/munin-pelletronic.mdwn
+++ b/projects/munin-pelletronic.mdwn
@@ -29,7 +29,7 @@ See the README document in the sources.
 * Touch V2.03 20140723
 
 <div class="screenshots">
-[[!img  pellematic_switches-week.png size="x150" alt="Graph of pellematic switches "]]
+[[!img  pellematic_switches-week.png alt="Graph of pellematic switches "]]
 </div>
 
 ## Mailing List

Add a image
diff --git a/projects/munin-pelletronic.mdwn b/projects/munin-pelletronic.mdwn
index d900d3a..50117b5 100644
--- a/projects/munin-pelletronic.mdwn
+++ b/projects/munin-pelletronic.mdwn
@@ -28,6 +28,10 @@ See the README document in the sources.
 
 * Touch V2.03 20140723
 
+<div class="screenshots">
+[[!img  pellematic_switches-week.png size="x150" alt="Graph of pellematic switches "]]
+</div>
+
 ## Mailing List
 Munin-pelletronic has it's own [mailing list][].
 
diff --git a/projects/munin-pelletronic/pellematic_switches-week.png b/projects/munin-pelletronic/pellematic_switches-week.png
new file mode 100644
index 0000000..daa593f
Binary files /dev/null and b/projects/munin-pelletronic/pellematic_switches-week.png differ

List currently tested versions
diff --git a/projects/munin-pelletronic.mdwn b/projects/munin-pelletronic.mdwn
index ff0fc1d..d900d3a 100644
--- a/projects/munin-pelletronic.mdwn
+++ b/projects/munin-pelletronic.mdwn
@@ -21,10 +21,13 @@ It can graph and monitor:
 ## Installation
 See the README document in the sources.
 
-
 [[!template  id=flattr thing="48460" name="Colors-of-Noise"]]
 [[!template  id=honk_git repo="munin-pelletronic"]]
 
+## Tested Versions
+
+* Touch V2.03 20140723
+
 ## Mailing List
 Munin-pelletronic has it's own [mailing list][].
 

Mention mailing list
diff --git a/projects/munin-pelletronic.mdwn b/projects/munin-pelletronic.mdwn
index 9611206..ff0fc1d 100644
--- a/projects/munin-pelletronic.mdwn
+++ b/projects/munin-pelletronic.mdwn
@@ -25,6 +25,8 @@ See the README document in the sources.
 [[!template  id=flattr thing="48460" name="Colors-of-Noise"]]
 [[!template  id=honk_git repo="munin-pelletronic"]]
 
+## Mailing List
+Munin-pelletronic has it's own [mailing list][].
 
 ## Author
 munin-pelletronic was written by [[Guido Günther|/agx]].
@@ -34,3 +36,4 @@ munin-pelletronic is free software and licensed under the GPL Version 3.
 
 
 [1]: http://munin-monitoring.org/
+[mailing list]: https://lists.sigxcpu.org/mailman/listinfo/munin-pelletronic

We use GSettings nowadays
diff --git a/projects/krb5-auth-dialog.mdwn b/projects/krb5-auth-dialog.mdwn
index f2f5871..be1eae0 100644
--- a/projects/krb5-auth-dialog.mdwn
+++ b/projects/krb5-auth-dialog.mdwn
@@ -55,7 +55,7 @@ There are currently three plugins available:
 * pam - invoke PAM modules
 * dummy - example plugin
 
-These plugins can be activated using a [GConf key][0]
+These plugins can be activated using a [key in GSettings][0]
 
 ### DBus API
 * There's a DBus API to acquire Kerberos ticktes. See the [examples][1]. [virt-manager][] is using this and [here](http://honk.sigxcpu.org/unsorted-patches/offlineimap_acquire-tgt.diff)'s a patch for [offlineimap][].
@@ -85,9 +85,8 @@ Status of current [Gnome goals][] in krb5-auth-dialog:
 * [Clean up GLib and GTK+ includes][] - done
 * [Use GtkBuilder instead of libglade][] - done
 * [Use a correct Generic Name][] - done
-* [Add GObject Introspection Support][] - TBD
 * [Use GSeal][] - done
-* [Migrate to GSettings / dconf][] - TBD
+* [Migrate to GSettings / dconf][] - done
 * [Migrate to GDBus][] - done
 
 ### Authors

Update gbp.conf
diff --git a/projects/git-buildpackage/gbp.conf b/projects/git-buildpackage/gbp.conf
index 7da678d..b959f77 100644
--- a/projects/git-buildpackage/gbp.conf
+++ b/projects/git-buildpackage/gbp.conf
@@ -1,8 +1,8 @@
 [DEFAULT]
 # Sign tags by default:
 sign-tags = True
-keyid = 0x3f3e6426
-# use pristine tar by defaul
+keyid = 0xB999CDB58C8DDBD2
+# use pristine tar by default
 pristine-tar = True
 
 [dch]
@@ -15,7 +15,11 @@ meta-closes = Closes|LP|BZ
 # Use the full commit message instead of the first line only
 full = True
 # Ignore these in commit messages
-ignore-regex = (Signed-off|Acked)-by:
+ignore-regex = (Signed-off|Acked)-by|git-svn-id:
+# Use author information from git
+git-author = True
+# Merge changelog entries by maintainer
+multimaint-merge = True
 
 [buildpackage]
 # Automatically push to remote repo after tagging a new release
@@ -26,7 +30,28 @@ postbuild = lintian $GBP_CHANGES_FILE
 builder = dpkg-buildpackage -i -I -uc -us
 # Clean command
 cleaner = /bin/true
+pbuilder = True
+pbuilder-options = --hookdir /home/agx/.pbuilder/hooks
 
 [import-orig]
 # Automatically forward the changelog after importing a new upstream version
-postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH
+#postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH
+import-msg = New upstream version %(version)s
+interactive = False
+
+[import-dsc]
+sign-tags = False
+allow-unauthenticated = True
+
+[remote-config pkg-libvirt]
+# Location of the repository
+remote-url-pattern = ssh://git.debian.org/git/pkg-libvirt/%(pkg)s
+# Template dir to passed to git-init
+template-dir = /srv/alioth.debian.org/chroot/home/groups/pkg-libvirt/git-template
+
+[remote-config calendarserver]
+# Location of the repository
+remote-url-pattern = ssh://git.debian.org/git/calendarserver/%(pkg)s
+
+[pq]
+patch-numbers = False

typo
diff --git a/projects/nss-dontstalkme.mdwn b/projects/nss-dontstalkme.mdwn
index ea688c0..4d20ee6 100644
--- a/projects/nss-dontstalkme.mdwn
+++ b/projects/nss-dontstalkme.mdwn
@@ -1,4 +1,4 @@
-nss-dontstalk me is a nsswitch module that maps host lookups of well known web
+nss-dontstalkme is a nsswitch module that maps host lookups of well known web
 trackers to localhost so they become uneffective.
 
 While other solutions such as browser plugins only target specific

Add nss-dontstalkme
diff --git a/index.mdwn b/index.mdwn
index f7a4732..7373cd9 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,6 +15,7 @@
 * [[projects/network-manager-iodine]] - network-manager DNS tunnel VPN plugin using iodine
 * [[projects/munin-pelletronic]] - Munin plugins to monitor Ökofen's Pelletmatic using a Pelletronic
 * [[projects/libplanfahr]] - GObject based library to query public transport information
+* [[projects/nss-dontstalkme]] - Glibc NSS module to block well known web trackers
 
 See [here](http://honk.sigxcpu.org/projects.html) for projects that haven't moved to [piki](http://honk.sigxcpu.org/piki) yet. There are also some [random patches](http://honk.sigxcpu.org/unsorted-patches/).
 
diff --git a/projects/nss-dontstalkme.mdwn b/projects/nss-dontstalkme.mdwn
new file mode 100644
index 0000000..ea688c0
--- /dev/null
+++ b/projects/nss-dontstalkme.mdwn
@@ -0,0 +1,33 @@
+nss-dontstalk me is a nsswitch module that maps host lookups of well known web
+trackers to localhost so they become uneffective.
+
+While other solutions such as browser plugins only target specific
+applications this affects the whole system.
+
+[[!toc ]]
+
+## Installation
+See the README file in the source.
+
+### Pre-built packages
+Debian Packages for Jessie can be found [here][].
+
+## Usage
+If using the Debian package now further setup is required. You need
+to change /etc/nsswitch.conf otherwise (see the README again). Check
+if it's working via:
+
+	getent ahostsv4 foo.google-analytics.com
+
+This should return only addresses of localhost.
+
+## TODO
+* Move blocked domains to config file?
+
+## Author
+nss-dontstalkme was written by [[Guido Günther|/agx]].
+
+## License
+nss-dontstalkme is free software and licensed under the LGPL Version 2.1.
+
+[here]: /projects/nss-dontstalkme/releases/

Add headline
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index a873a1a..49a7721 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,3 +1,5 @@
+### Talks
+
 [[Debian LTS/Shared Library Security Updates|https://honk.sigxcpu.org/gitweb/?p=talks/2014-09-08-fsfe-debian-lts-whatmaps.git;a=blob_plain;f=talk.pdf]] at FSFE Fellowship Meeting, Bonn, Germany 2014
 
 [[Debian 360°|2013-12-debian.pdf]] at [FSFE Fellowship Meeting](https://wiki.fsfe.org/FellowshipEvents/Fellowship%20Meeting%20Bonn%202013-12), Bonn, Germany, 2013

Add FSFE talk
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index bb436d6..a873a1a 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,3 +1,5 @@
+[[Debian LTS/Shared Library Security Updates|https://honk.sigxcpu.org/gitweb/?p=talks/2014-09-08-fsfe-debian-lts-whatmaps.git;a=blob_plain;f=talk.pdf]] at FSFE Fellowship Meeting, Bonn, Germany 2014
+
 [[Debian 360°|2013-12-debian.pdf]] at [FSFE Fellowship Meeting](https://wiki.fsfe.org/FellowshipEvents/Fellowship%20Meeting%20Bonn%202013-12), Bonn, Germany, 2013
 
 [[The GNOME3 Desktop and You|2011-08-gnome3-froscon.pdf]] at [FroSCon 2011](http://programm.froscon.org/2011/events/770.html), Sankt Augustin, Germany, 2011 ([video][1])

Fix link display
diff --git a/agx/publications.mdwn b/agx/publications.mdwn
index 48db4b8..bb436d6 100644
--- a/agx/publications.mdwn
+++ b/agx/publications.mdwn
@@ -1,6 +1,6 @@
 [[Debian 360°|2013-12-debian.pdf]] at [FSFE Fellowship Meeting](https://wiki.fsfe.org/FellowshipEvents/Fellowship%20Meeting%20Bonn%202013-12), Bonn, Germany, 2013
 
-[[The GNOME3 Desktop and You|2011-08-gnome3-froscon.pdf]] at [FroSCon 2011](http://programm.froscon.org/2011/events/770.html), Sankt Augustin, Germany, 2011 (video[1])
+[[The GNOME3 Desktop and You|2011-08-gnome3-froscon.pdf]] at [FroSCon 2011](http://programm.froscon.org/2011/events/770.html), Sankt Augustin, Germany, 2011 ([video][1])
 
 [[Debian, Groupware and You|2011-06-debian-groupware-zs.pdf]] at [Zarafa Summercamp 2011](http://www.zarafa.com/summercamp2011/program-1-july), Kerkrade, Netherlands, 2011