diff --git a/Makefile b/Makefile
index af97abd..a8b71d5 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,8 @@ clean:
 
 deploy: pinlist.txt
 	mkdir -p $(PINLIST_DIR)
-	rsync -avP ./pinlist.txt $(PINLIST_DIR)/pinlist.txt
+	cat ./pinlist.txt > $(PINLIST_DIR)/pinlist.txt
+	cat ./bin/pin.sh > $(PINLIST_DIR)/pin.sh
 	ipfs add -r $(IPFS_ROOT) | \
 		tail -1 | \
 		awk -F' ' '{print $$2}' | \
@@ -18,5 +19,13 @@ deploy: pinlist.txt
 
 
 pinlist.txt: pins/*.json
-	jq -r .pins[] $^ > pinlist.new && mv pinlist.new $@
-	echo "# $$(date -u +%s)" >> $@
+	jq -r .pins[] $^ > pinlist.new && mv pinlist.new $@.tmp
+	echo "# timestamp=$$(date -u +%s)" >> $@.tmp
+	cat $@.tmp | sort | uniq > $@
+	rm $@.tmp
+
+tidy:
+	for X in pins/*.json ; do \
+		echo $$X ; \
+		jq -S --indent 4 . $$X > $$X.new && mv $$X.new $$X ; \
+	done
diff --git a/pins/ber1-test-name.json b/pins/ber1-test-name.json
index e4ffa79..215dea3 100644
--- a/pins/ber1-test-name.json
+++ b/pins/ber1-test-name.json
@@ -1,11 +1,11 @@
 {
-  "contact": {
-    "email": "sneak@sneak.berlin",
-    "name": "Jeffrey Paul"
-  },
-  "description": "test name from ber1 (sneak fileserver)",
-  "pins": [
-    "/ipns/QmZKpS7iyUnDXcUxhou5arokZ5bZViZokEzDVAEGctBSMw"
-  ],
-  "url": "https://sneak.berlin"
+    "contact": {
+        "email": "sneak@sneak.berlin",
+        "name": "Jeffrey Paul"
+    },
+    "description": "test name from ber1 (sneak fileserver)",
+    "pins": [
+        "/ipns/QmZKpS7iyUnDXcUxhou5arokZ5bZViZokEzDVAEGctBSMw/helloworld"
+    ],
+    "url": "https://sneak.berlin"
 }
diff --git a/pins/ber1-ubuntu-metadata-mirror.json b/pins/ber1-ubuntu-metadata-mirror.json
new file mode 100644
index 0000000..e1b8f9c
--- /dev/null
+++ b/pins/ber1-ubuntu-metadata-mirror.json
@@ -0,0 +1,11 @@
+{
+    "contact": {
+        "email": "sneak@sneak.berlin",
+        "name": "Jeffrey Paul"
+    },
+    "description": "ubuntu trusty and xenial apt metadata mirror (<200MiB)",
+    "pins": [
+        "/ipns/QmZKpS7iyUnDXcUxhou5arokZ5bZViZokEzDVAEGctBSMw/mirrors/ubuntu/current/dists"
+    ],
+    "url": "https://sneak.berlin/"
+}
diff --git a/pins/fails.json b/pins/fails.json
index 864b588..3f84abc 100644
--- a/pins/fails.json
+++ b/pins/fails.json
@@ -1,10 +1,10 @@
 {
-  "contact": {
-    "email": "sneak@sneak.berlin",
-    "name": "Jeffrey Paul"
-  },
-  "description": "this ipns will intentionally not resolve for testing",
-  "pins": [
-    "/ipns/QmaN64WRYdHBojWFQRLxkdjtX6TEnqnCq8uAug11111111"
-  ]
+    "contact": {
+        "email": "sneak@sneak.berlin",
+        "name": "Jeffrey Paul"
+    },
+    "description": "this ipns will intentionally not resolve for testing",
+    "pins": [
+        "/ipns/QmaN64WRYdHBojWFQRLxkdjtX6TEnqnCq8uAug11111111"
+    ]
 }
diff --git a/pins/go-ipfs_v0.4.4.json b/pins/go-ipfs_v0.4.4.json
index fad0812..7d5a693 100644
--- a/pins/go-ipfs_v0.4.4.json
+++ b/pins/go-ipfs_v0.4.4.json
@@ -1,13 +1,13 @@
 {
-  "description": "go-ipfs v0.4.4 binaries",
-  "pins": [
-    "/ipfs/QmXvDdqieUAUo7srRVXvsKZRmzNGkuhRqWKYXLcXnBm4dc",
-    "/ipfs/QmPsMMi2Lq15QDNa8vmyZwwE15KbgUnHkQz3MX8pR5oUvq",
-    "/ipfs/QmQZyL5sWdXQyS9UwPHRsSv5yXz1cWRgTV9C6zS6EsGnBv",
-    "/ipfs/QmRCXbtDRFUVLYndxxrobsPEKSBNJtPbvq4FTMKWBWqneE",
-    "/ipfs/QmRE6QGDsRhHT81etCKKRvUucoQTY4KqjoH8RKW6jaF7kX",
-    "/ipfs/QmUb7jGAgYd4AAGX82qY3Znt2Xrx3FLC2N6jiYVMcSTcMq",
-    "/ipfs/QmPPNuaTHcoFesnZuVjSMaxPVifunrVqFGj3avjTaKSLz3",
-    "/ipfs/QmdZ81FrNJYnjHbzuX6L2vqfBmEvRFwUgRU2TdPHU8WNLL"
-  ]
+    "description": "go-ipfs v0.4.4 binaries",
+    "pins": [
+        "/ipfs/QmXvDdqieUAUo7srRVXvsKZRmzNGkuhRqWKYXLcXnBm4dc",
+        "/ipfs/QmPsMMi2Lq15QDNa8vmyZwwE15KbgUnHkQz3MX8pR5oUvq",
+        "/ipfs/QmQZyL5sWdXQyS9UwPHRsSv5yXz1cWRgTV9C6zS6EsGnBv",
+        "/ipfs/QmRCXbtDRFUVLYndxxrobsPEKSBNJtPbvq4FTMKWBWqneE",
+        "/ipfs/QmRE6QGDsRhHT81etCKKRvUucoQTY4KqjoH8RKW6jaF7kX",
+        "/ipfs/QmUb7jGAgYd4AAGX82qY3Znt2Xrx3FLC2N6jiYVMcSTcMq",
+        "/ipfs/QmPPNuaTHcoFesnZuVjSMaxPVifunrVqFGj3avjTaKSLz3",
+        "/ipfs/QmdZ81FrNJYnjHbzuX6L2vqfBmEvRFwUgRU2TdPHU8WNLL"
+    ]
 }
diff --git a/pins/ipfs-webui.json b/pins/ipfs-webui.json
index 9b2c1c5..ebb176e 100644
--- a/pins/ipfs-webui.json
+++ b/pins/ipfs-webui.json
@@ -1,12 +1,12 @@
 {
-  "description": "webui files",
-  "pins": [
-    "/ipfs/QmS2HL9v5YeKgQkkWMvs1EMnFtUowTEdFfSSeMT4pos1e6",
-    "/ipfs/QmXdu7HWdV6CUaUabd9q2ZeA4iHZLVyDRj3Gi4dsJsWjbr",
-    "/ipfs/QmaaqrHyAQm7gALkRW8DcfGX3u8q9rWKnxEMmf7m9z515w",
-    "/ipfs/QmSHDxWsMPuJQKWmVA1rB5a3NX2Eme5fPqNb63qwaqiqSp",
-    "/ipfs/QmctngrQAt9fjpQUZr7Bx3BsXUcif52eZGTizWhvcShsjz",
-    "/ipfs/QmXX7YRpU7nNBKfw75VG7Y1c3GwpSAGHRev67XVPgZFv9R"
-  ],
-  "url": "https://github.com/ipfs/refs-solarnet-storage/commit/df0a2cc4b53cea15132bec2d0b96b5d2d7a87ffb"
+    "description": "webui files",
+    "pins": [
+        "/ipfs/QmS2HL9v5YeKgQkkWMvs1EMnFtUowTEdFfSSeMT4pos1e6",
+        "/ipfs/QmXdu7HWdV6CUaUabd9q2ZeA4iHZLVyDRj3Gi4dsJsWjbr",
+        "/ipfs/QmaaqrHyAQm7gALkRW8DcfGX3u8q9rWKnxEMmf7m9z515w",
+        "/ipfs/QmSHDxWsMPuJQKWmVA1rB5a3NX2Eme5fPqNb63qwaqiqSp",
+        "/ipfs/QmctngrQAt9fjpQUZr7Bx3BsXUcif52eZGTizWhvcShsjz",
+        "/ipfs/QmXX7YRpU7nNBKfw75VG7Y1c3GwpSAGHRev67XVPgZFv9R"
+    ],
+    "url": "https://github.com/ipfs/refs-solarnet-storage/commit/df0a2cc4b53cea15132bec2d0b96b5d2d7a87ffb"
 }
diff --git a/pins/sneak.berlin.json b/pins/sneak.berlin.json
index 6ae8e5d..76141ea 100644
--- a/pins/sneak.berlin.json
+++ b/pins/sneak.berlin.json
@@ -1,11 +1,11 @@
 {
-  "contact": {
-    "email": "sneak@sneak.berlin",
-    "name": "Jeffrey Paul"
-  },
-  "description": "Personal blog of Jeffrey Paul",
-  "pins": [
-    "/ipns/QmaN64WRYdHBojWFQRLxkdjtX6TEnqnCq8uAugpyJJpCVp/website"
-  ],
-  "url": "https://sneak.berlin"
+    "contact": {
+        "email": "sneak@sneak.berlin",
+        "name": "Jeffrey Paul"
+    },
+    "description": "Personal blog of Jeffrey Paul",
+    "pins": [
+        "/ipns/QmaN64WRYdHBojWFQRLxkdjtX6TEnqnCq8uAugpyJJpCVp/website"
+    ],
+    "url": "https://sneak.berlin"
 }