diff --git a/README.md b/README.md
index 3702efcf..9e3366f1 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # pmbootstrap
-[**Introduction**](https://postmarketos.org/blog/2017/05/26/intro/) | [**Security Warning**](https://ollieparanoid.github.io/post/security-warning/) | [**Devices**](https://wiki.postmarketos.org/wiki/Devices) | [![travis badge](https://api.travis-ci.org/postmarketOS/pmbootstrap.png?branch=master)](https://travis-ci.org/postmarketOS/pmbootstrap) | [![Coverage Status](https://coveralls.io/repos/github/postmarketOS/pmbootstrap/badge.svg?branch=master)](https://coveralls.io/github/postmarketOS/pmbootstrap?branch=master)
+[**Introduction**](https://postmarketos.org/blog/2017/05/26/intro/) | [**Security Warning**](https://ollieparanoid.github.io/post/security-warning/) | [**Devices**](https://wiki.postmarketos.org/wiki/Devices)
 
 Sophisticated chroot/build/flash tool to develop and install [postmarketOS](https://postmarketos.org).
 
diff --git a/aports/device/device-amazon-thor/APKBUILD b/aports/device/device-amazon-thor/APKBUILD
index 61ec8a6e..6ea5780a 100755
--- a/aports/device/device-amazon-thor/APKBUILD
+++ b/aports/device/device-amazon-thor/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-amazon-thor
 pkgver=1
 pkgrel=8
 pkgdesc="Amazon KFHDX 7inch 2013"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-amazon-thor mkbootimg msm-fb-refresher mesa-dri-swrast"
diff --git a/aports/device/device-asus-flo/APKBUILD b/aports/device/device-asus-flo/APKBUILD
index c1d65e5c..6fb7e6ed 100644
--- a/aports/device/device-asus-flo/APKBUILD
+++ b/aports/device/device-asus-flo/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-asus-flo
 pkgver=0
 pkgrel=12
 pkgdesc="Google Nexus 7 2013 flo"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-asus-flo mkbootimg mesa mesa-egl mesa-dri-freedreno"
diff --git a/aports/device/device-asus-grouper/APKBUILD b/aports/device/device-asus-grouper/APKBUILD
index ec8fb068..eb017378 100644
--- a/aports/device/device-asus-grouper/APKBUILD
+++ b/aports/device/device-asus-grouper/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-asus-grouper
 pkgver=1
 pkgrel=13
 pkgdesc="Asus Nexus 7 2012 Wifi"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-asus-grouper mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-fairphone-fp2/APKBUILD b/aports/device/device-fairphone-fp2/APKBUILD
index 4221000f..9742f597 100644
--- a/aports/device/device-fairphone-fp2/APKBUILD
+++ b/aports/device/device-fairphone-fp2/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-fairphone-fp2
 pkgver=1
 pkgrel=9
 pkgdesc="Fairphone 2"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-fairphone-fp2 mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-htc-ace/APKBUILD b/aports/device/device-htc-ace/APKBUILD
index 2c565672..e4f536e1 100644
--- a/aports/device/device-htc-ace/APKBUILD
+++ b/aports/device/device-htc-ace/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-htc-ace
 pkgver=1
 pkgrel=11
 pkgdesc="HTC Desire HD"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-htc-ace mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-htc-bravo/APKBUILD b/aports/device/device-htc-bravo/APKBUILD
index fdb321a3..ac6bdcc1 100644
--- a/aports/device/device-htc-bravo/APKBUILD
+++ b/aports/device/device-htc-bravo/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-htc-bravo
 pkgver=1
 pkgrel=12
 pkgdesc="HTC Desire"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-htc-bravo mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-huawei-angler/APKBUILD b/aports/device/device-huawei-angler/APKBUILD
index d698c867..8f46ea37 100644
--- a/aports/device/device-huawei-angler/APKBUILD
+++ b/aports/device/device-huawei-angler/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-huawei-angler
 pkgver=1
 pkgrel=12
 pkgdesc="Huawei Nexus 6P"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-huawei-angler mkbootimg msm-fb-refresher mesa-dri-swrast"
diff --git a/aports/device/device-huawei-y530/APKBUILD b/aports/device/device-huawei-y530/APKBUILD
index 07eb7b57..6ae413bd 100644
--- a/aports/device/device-huawei-y530/APKBUILD
+++ b/aports/device/device-huawei-y530/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-huawei-y530
 pkgver=1
 pkgrel=10
 pkgdesc="Huawei Ascend Y530"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-huawei-y530 mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-lg-d285/APKBUILD b/aports/device/device-lg-d285/APKBUILD
index e46f655f..58d71ed5 100644
--- a/aports/device/device-lg-d285/APKBUILD
+++ b/aports/device/device-lg-d285/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-lg-d285
 pkgver=1
 pkgrel=6
 pkgdesc="LG L65"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-lg-d285 mkbootimg msm-fb-refresher mesa-dri-swrast"
diff --git a/aports/device/device-lg-d855/APKBUILD b/aports/device/device-lg-d855/APKBUILD
index bd2a3e54..12c79e06 100644
--- a/aports/device/device-lg-d855/APKBUILD
+++ b/aports/device/device-lg-d855/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-lg-d855
 pkgver=1
 pkgrel=14
 pkgdesc="LG G3 International"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-lg-d855 mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-lg-dory/APKBUILD b/aports/device/device-lg-dory/APKBUILD
index efff5198..5cb04e15 100644
--- a/aports/device/device-lg-dory/APKBUILD
+++ b/aports/device/device-lg-dory/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-lg-dory
 pkgver=1
 pkgrel=7
 pkgdesc="LG G Watch"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-lg-dory mkbootimg msm-fb-refresher mesa-dri-swrast"
diff --git a/aports/device/device-lg-hammerhead/APKBUILD b/aports/device/device-lg-hammerhead/APKBUILD
index 4d4482d5..c340b8cb 100644
--- a/aports/device/device-lg-hammerhead/APKBUILD
+++ b/aports/device/device-lg-hammerhead/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-lg-hammerhead
 pkgver=2
 pkgrel=0
 pkgdesc="Google Nexus 5"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-postmarketos-qcom mkbootimg mesa-dri-freedreno ofono"
diff --git a/aports/device/device-lg-lenok/APKBUILD b/aports/device/device-lg-lenok/APKBUILD
index 2bb66241..ce3d6982 100644
--- a/aports/device/device-lg-lenok/APKBUILD
+++ b/aports/device/device-lg-lenok/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-lg-lenok
 pkgver=1
 pkgrel=9
 pkgdesc="LG G Watch R"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-lg-lenok mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-lg-mako/APKBUILD b/aports/device/device-lg-mako/APKBUILD
index f6cd122a..2107c481 100644
--- a/aports/device/device-lg-mako/APKBUILD
+++ b/aports/device/device-lg-mako/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-lg-mako
 pkgver=2
 pkgrel=19
 pkgdesc="Google Nexus 4"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-lg-mako mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-motorola-osprey/APKBUILD b/aports/device/device-motorola-osprey/APKBUILD
index bb16c2a6..5a128c23 100644
--- a/aports/device/device-motorola-osprey/APKBUILD
+++ b/aports/device/device-motorola-osprey/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-motorola-osprey
 pkgver=1
 pkgrel=6
 pkgdesc="Motorola Moto G 3rd gen. (2015)"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-motorola-osprey mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-motorola-titan/APKBUILD b/aports/device/device-motorola-titan/APKBUILD
index 3f80e8ca..dba0a9a3 100644
--- a/aports/device/device-motorola-titan/APKBUILD
+++ b/aports/device/device-motorola-titan/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-motorola-titan
 pkgver=1
 pkgrel=26
 pkgdesc="Motorola Moto G 2014"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-motorola-titan mkbootimg msm-fb-refresher mesa-dri-swrast"
diff --git a/aports/device/device-nokia-n9/APKBUILD b/aports/device/device-nokia-n9/APKBUILD
index 08a3caed..8efb067c 100644
--- a/aports/device/device-nokia-n9/APKBUILD
+++ b/aports/device/device-nokia-n9/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-nokia-n9
 pkgver=1
 pkgrel=6
 pkgdesc="Nokia N9"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-nokia-n9 ofono watchdog-kick"
diff --git a/aports/device/device-nokia-n900/APKBUILD b/aports/device/device-nokia-n900/APKBUILD
index 4fb90d6c..20e0e98b 100644
--- a/aports/device/device-nokia-n900/APKBUILD
+++ b/aports/device/device-nokia-n900/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-nokia-n900
 pkgver=2
 pkgrel=8
 pkgdesc="Nokia N900"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-postmarketos-stable uboot-tools kbd kbd-bkeymaps ofono mesa-dri-swrast"
diff --git a/aports/device/device-oneplus-bacon/APKBUILD b/aports/device/device-oneplus-bacon/APKBUILD
index 2c3daae2..4be6a432 100644
--- a/aports/device/device-oneplus-bacon/APKBUILD
+++ b/aports/device/device-oneplus-bacon/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-oneplus-bacon
 pkgver=1
 pkgrel=12
 pkgdesc="OnePlus One"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-oneplus-bacon mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-oneplus-onyx/APKBUILD b/aports/device/device-oneplus-onyx/APKBUILD
index b6c62360..28cb02e2 100644
--- a/aports/device/device-oneplus-onyx/APKBUILD
+++ b/aports/device/device-oneplus-onyx/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-oneplus-onyx
 pkgver=1
 pkgrel=6
 pkgdesc="OnePlus X"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-oneplus-onyx mkbootimg msm-fb-refresher mesa-dri-swrast"
diff --git a/aports/device/device-qemu-aarch64/APKBUILD b/aports/device/device-qemu-aarch64/APKBUILD
index 6d4706c7..76aeca09 100644
--- a/aports/device/device-qemu-aarch64/APKBUILD
+++ b/aports/device/device-qemu-aarch64/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-qemu-aarch64
 pkgver=1
 pkgrel=13
 pkgdesc="Simulated device in qemu with vexpress soc"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 # NOTE: 'pmbootstrap init' allows you to choose the mesa-dri-* package
diff --git a/aports/device/device-qemu-amd64/APKBUILD b/aports/device/device-qemu-amd64/APKBUILD
index 03255bf6..3df5726d 100644
--- a/aports/device/device-qemu-amd64/APKBUILD
+++ b/aports/device/device-qemu-amd64/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-qemu-amd64
 pkgver=1
 pkgrel=18
 pkgdesc="Simulated device in qemu with an x86 platform"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 # NOTE: 'pmbootstrap init' allows you to choose the mesa-dri-* package
diff --git a/aports/device/device-qemu-vexpress/APKBUILD b/aports/device/device-qemu-vexpress/APKBUILD
index 2694c123..a4b21c57 100644
--- a/aports/device/device-qemu-vexpress/APKBUILD
+++ b/aports/device/device-qemu-vexpress/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-qemu-vexpress
 pkgver=1
 pkgrel=20
 pkgdesc="Simulated device in qemu with vexpress soc"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 # NOTE: 'pmbootstrap init' allows you to choose the mesa-dri-* package
diff --git a/aports/device/device-samsung-i9003/APKBUILD b/aports/device/device-samsung-i9003/APKBUILD
index 4d2bad06..9a20600b 100644
--- a/aports/device/device-samsung-i9003/APKBUILD
+++ b/aports/device/device-samsung-i9003/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-samsung-i9003
 pkgver=1
 pkgrel=18
 pkgdesc="Samsung Galaxy SI SLC"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-samsung-i9003 libsamsung-ipc mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-samsung-i9070/APKBUILD b/aports/device/device-samsung-i9070/APKBUILD
index 10cc9ecf..896fc068 100644
--- a/aports/device/device-samsung-i9070/APKBUILD
+++ b/aports/device/device-samsung-i9070/APKBUILD
@@ -3,7 +3,7 @@ pkgname=device-samsung-i9070
 pkgver=1
 pkgrel=23
 pkgdesc="Samsung Galaxy S Advance"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-samsung-i9070 mesa-dri-swrast"
diff --git a/aports/device/device-samsung-i9100/APKBUILD b/aports/device/device-samsung-i9100/APKBUILD
index c0c79766..f2a85d85 100644
--- a/aports/device/device-samsung-i9100/APKBUILD
+++ b/aports/device/device-samsung-i9100/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-samsung-i9100
 pkgver=1
 pkgrel=20
 pkgdesc="Samsung Galaxy SII"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-samsung-i9100 libsamsung-ipc mesa-dri-swrast"
diff --git a/aports/device/device-samsung-i9305/APKBUILD b/aports/device/device-samsung-i9305/APKBUILD
index f74dd76d..d3209bd8 100644
--- a/aports/device/device-samsung-i9305/APKBUILD
+++ b/aports/device/device-samsung-i9305/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-samsung-i9305
 pkgver=1
 pkgrel=19
 pkgdesc="Samsung Galaxy SIII LTE"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-samsung-i9305 mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-samsung-maguro/APKBUILD b/aports/device/device-samsung-maguro/APKBUILD
index caa55184..1b877410 100644
--- a/aports/device/device-samsung-maguro/APKBUILD
+++ b/aports/device/device-samsung-maguro/APKBUILD
@@ -3,7 +3,7 @@ pkgname=device-samsung-maguro
 pkgver=2
 pkgrel=20
 pkgdesc="Google Galaxy Nexus (GSM)"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-samsung-maguro mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-samsung-n7100/APKBUILD b/aports/device/device-samsung-n7100/APKBUILD
index 214f0d70..52de10d6 100644
--- a/aports/device/device-samsung-n7100/APKBUILD
+++ b/aports/device/device-samsung-n7100/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-samsung-n7100
 pkgver=1
 pkgrel=15
 pkgdesc="Samsung Galaxy Note II (GSM)"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-samsung-n7100 mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-sony-amami/APKBUILD b/aports/device/device-sony-amami/APKBUILD
index 5a10f70b..b5851355 100644
--- a/aports/device/device-sony-amami/APKBUILD
+++ b/aports/device/device-sony-amami/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-sony-amami
 pkgver=2
 pkgrel=0
 pkgdesc="Sony Xperia Z1 Compact"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base mkbootimg mdss-fb-init-hack mesa-dri-swrast"
diff --git a/aports/device/device-sony-aries/APKBUILD b/aports/device/device-sony-aries/APKBUILD
index 97a36898..1f343b8e 100644
--- a/aports/device/device-sony-aries/APKBUILD
+++ b/aports/device/device-sony-aries/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-sony-aries
 pkgver=1
 pkgrel=16
 pkgdesc="Sony Xperia Z3 Compact"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-sony-aries mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-sony-castor-windy/APKBUILD b/aports/device/device-sony-castor-windy/APKBUILD
index e4ad0bf6..8a6cf9fa 100644
--- a/aports/device/device-sony-castor-windy/APKBUILD
+++ b/aports/device/device-sony-castor-windy/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-sony-castor-windy
 pkgver=1
 pkgrel=13
 pkgdesc="Sony Xperia Z2 Tablet WIFI"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base mkbootimg linux-sony-castor-windy mesa-dri-freedreno"
diff --git a/aports/device/device-sony-sirius/APKBUILD b/aports/device/device-sony-sirius/APKBUILD
index 253d177a..d1276a91 100644
--- a/aports/device/device-sony-sirius/APKBUILD
+++ b/aports/device/device-sony-sirius/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-sony-sirius
 pkgver=1
 pkgrel=1
 pkgdesc="Sony Xperia Z2 device package"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-postmarketos-qcom mkbootimg mesa-dri-freedreno"
diff --git a/aports/device/device-sony-yuga/APKBUILD b/aports/device/device-sony-yuga/APKBUILD
index bdeff74a..49aa0106 100644
--- a/aports/device/device-sony-yuga/APKBUILD
+++ b/aports/device/device-sony-yuga/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-sony-yuga
 pkgver=1
 pkgrel=10
 pkgdesc="Sony Xperia Z"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-sony-yuga mkbootimg mesa-dri-swrast"
diff --git a/aports/device/device-t2m-flame/APKBUILD b/aports/device/device-t2m-flame/APKBUILD
index f7bb9e5b..18cded6d 100644
--- a/aports/device/device-t2m-flame/APKBUILD
+++ b/aports/device/device-t2m-flame/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-t2m-flame
 pkgver=1
 pkgrel=12
 pkgdesc="Mozilla Flame"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-t2m-flame mkbootimg mesa-dri-swrast"
diff --git a/aports/firmware/firmware-asus-duma/APKBUILD b/aports/firmware/firmware-asus-duma/APKBUILD
index e5f5ffb3..8cfecc2d 100644
--- a/aports/firmware/firmware-asus-duma/APKBUILD
+++ b/aports/firmware/firmware-asus-duma/APKBUILD
@@ -2,7 +2,7 @@ pkgname=firmware-asus-duma
 pkgver=1
 pkgrel=1
 pkgdesc="Firmware files for ASUS MeMO Pad FHD 10 (asus-duma)"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="proprietary"
 depends="wcnss-wlan"
diff --git a/aports/firmware/firmware-huawei-y530/APKBUILD b/aports/firmware/firmware-huawei-y530/APKBUILD
index af96c212..e6b858b0 100644
--- a/aports/firmware/firmware-huawei-y530/APKBUILD
+++ b/aports/firmware/firmware-huawei-y530/APKBUILD
@@ -2,7 +2,7 @@ pkgname=firmware-huawei-y530
 pkgver=1
 pkgrel=1
 pkgdesc="Firmware files for Huawei Ascend Y530"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="proprietary"
 depends="wcnss-wlan"
diff --git a/aports/firmware/firmware-lenovo-karate/APKBUILD b/aports/firmware/firmware-lenovo-karate/APKBUILD
index d1bf7d8f..c4683d41 100644
--- a/aports/firmware/firmware-lenovo-karate/APKBUILD
+++ b/aports/firmware/firmware-lenovo-karate/APKBUILD
@@ -2,7 +2,7 @@ pkgname=firmware-lenovo-karate
 pkgver=1
 pkgrel=0
 pkgdesc="Firmware files for Lenovo K6 Power"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="proprietary"
 depends="wcnss-wlan"
diff --git a/aports/firmware/firmware-motorola-titan/APKBUILD b/aports/firmware/firmware-motorola-titan/APKBUILD
index 4f0d8b5a..bb2b97db 100644
--- a/aports/firmware/firmware-motorola-titan/APKBUILD
+++ b/aports/firmware/firmware-motorola-titan/APKBUILD
@@ -2,7 +2,7 @@ pkgname=firmware-motorola-titan
 pkgver=1
 pkgrel=1
 pkgdesc="Firmware files for Motorola Moto G 2014 (titan) and Moto G 4G 2013 (peregrine)"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="proprietary"
 depends="wcnss-wlan"
diff --git a/aports/firmware/firmware-samsung-maguro/APKBUILD b/aports/firmware/firmware-samsung-maguro/APKBUILD
index 9936b81d..628921fc 100644
--- a/aports/firmware/firmware-samsung-maguro/APKBUILD
+++ b/aports/firmware/firmware-samsung-maguro/APKBUILD
@@ -2,7 +2,7 @@ pkgname=firmware-samsung-maguro
 pkgver=1
 pkgrel=0
 pkgdesc="Google Galaxy Nexus (GSM) Firmware"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="proprietary"
 depends="firmware-aosp-broadcom-wlan"
diff --git a/aports/firmware/firmware-xiaomi-mido/APKBUILD b/aports/firmware/firmware-xiaomi-mido/APKBUILD
index 16c0f98c..a754c608 100644
--- a/aports/firmware/firmware-xiaomi-mido/APKBUILD
+++ b/aports/firmware/firmware-xiaomi-mido/APKBUILD
@@ -2,7 +2,7 @@ pkgname=firmware-xiaomi-mido
 pkgver=1
 pkgrel=1
 pkgdesc="Firmware files for Xiaomi Redmi Note 4"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="proprietary"
 depends="wcnss-wlan"
diff --git a/aports/main/devicepkg-dev/APKBUILD b/aports/main/devicepkg-dev/APKBUILD
index 650e3efc..f9006ec0 100644
--- a/aports/main/devicepkg-dev/APKBUILD
+++ b/aports/main/devicepkg-dev/APKBUILD
@@ -2,7 +2,7 @@ pkgname="devicepkg-dev"
 pkgver=0.2
 pkgrel=0
 pkgdesc="Provides default device package functions"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="all"
 license="MIT"
 source="
diff --git a/aports/main/fbdebug/APKBUILD b/aports/main/fbdebug/APKBUILD
index 75b772b7..a707a64f 100644
--- a/aports/main/fbdebug/APKBUILD
+++ b/aports/main/fbdebug/APKBUILD
@@ -4,7 +4,7 @@ pkgname=fbdebug
 pkgver=0.2
 pkgrel=0
 pkgdesc="Framebuffer debugging tool"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="all"
 license="GPL2"
 makedepends="linux-headers"
diff --git a/aports/main/postmarketos-android-recovery-installer/APKBUILD b/aports/main/postmarketos-android-recovery-installer/APKBUILD
index a8df456b..4c926f79 100644
--- a/aports/main/postmarketos-android-recovery-installer/APKBUILD
+++ b/aports/main/postmarketos-android-recovery-installer/APKBUILD
@@ -2,7 +2,7 @@ pkgname=postmarketos-android-recovery-installer
 pkgver=0.1.7
 pkgrel=0
 pkgdesc="TWRP compatible postmarketOS installer script"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 # multipath-tools: kpartx
 depends="busybox-extras lddtree cryptsetup multipath-tools device-mapper parted util-linux zip e2fsprogs tar"
 source="build_zip.sh
diff --git a/aports/main/postmarketos-base/APKBUILD b/aports/main/postmarketos-base/APKBUILD
index 52cce722..3cf8b116 100644
--- a/aports/main/postmarketos-base/APKBUILD
+++ b/aports/main/postmarketos-base/APKBUILD
@@ -2,7 +2,7 @@ pkgname=postmarketos-base
 pkgver=3
 pkgrel=18
 pkgdesc="Meta package for minimal postmarketOS base"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="GPL3+"
 depends="
diff --git a/aports/main/postmarketos-demos/APKBUILD b/aports/main/postmarketos-demos/APKBUILD
index 5c1665b7..b5615e1a 100644
--- a/aports/main/postmarketos-demos/APKBUILD
+++ b/aports/main/postmarketos-demos/APKBUILD
@@ -2,7 +2,7 @@ pkgname=postmarketos-demos
 pkgver=6
 pkgrel=0
 pkgdesc="Simple touch menu for a few demo programs"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="all"
 license="GPL3+"
 depends="weston-xwayland dbus"
diff --git a/aports/main/postmarketos-mkinitfs-hook-debug-shell/APKBUILD b/aports/main/postmarketos-mkinitfs-hook-debug-shell/APKBUILD
index 4cb76557..afcd7a31 100644
--- a/aports/main/postmarketos-mkinitfs-hook-debug-shell/APKBUILD
+++ b/aports/main/postmarketos-mkinitfs-hook-debug-shell/APKBUILD
@@ -2,7 +2,7 @@ pkgname=postmarketos-mkinitfs-hook-debug-shell
 pkgver=0.1.1
 pkgrel=2
 pkgdesc="Root shell in the initramfs (security hole, for debugging only)"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 depends="postmarketos-mkinitfs fbdebug evtest linuxconsoletools"
 source="20-debug-shell.sh 20-debug-shell.files"
 arch="noarch"
diff --git a/aports/main/postmarketos-mkinitfs-hook-maximum-attention/APKBUILD b/aports/main/postmarketos-mkinitfs-hook-maximum-attention/APKBUILD
index da7a5df1..25bd3008 100644
--- a/aports/main/postmarketos-mkinitfs-hook-maximum-attention/APKBUILD
+++ b/aports/main/postmarketos-mkinitfs-hook-maximum-attention/APKBUILD
@@ -2,7 +2,7 @@ pkgname=postmarketos-mkinitfs-hook-maximum-attention
 pkgver=0.1.0
 pkgrel=0
 pkgdesc="Script to activate all user-visible outputs from the initramfs (to confirm working kernel, for debugging only)"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 depends="postmarketos-mkinitfs"
 source="00-maximum-attention.sh"
 arch="noarch"
diff --git a/aports/main/postmarketos-mkinitfs/APKBUILD b/aports/main/postmarketos-mkinitfs/APKBUILD
index 472da5f6..7e2ec86d 100644
--- a/aports/main/postmarketos-mkinitfs/APKBUILD
+++ b/aports/main/postmarketos-mkinitfs/APKBUILD
@@ -2,7 +2,7 @@ pkgname=postmarketos-mkinitfs
 pkgver=0.6.6
 pkgrel=1
 pkgdesc="Tool to generate initramfs images for postmarketOS"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 # multipath-tools: kpartx
 depends="busybox-extras lddtree cryptsetup kmod multipath-tools postmarketos-splash
 	device-mapper parted e2fsprogs e2fsprogs-extra osk-sdl charging-sdl triggerhappy"
diff --git a/aports/main/postmarketos-ui-hildon/APKBUILD b/aports/main/postmarketos-ui-hildon/APKBUILD
index 0de9d871..6270b5ad 100644
--- a/aports/main/postmarketos-ui-hildon/APKBUILD
+++ b/aports/main/postmarketos-ui-hildon/APKBUILD
@@ -2,7 +2,7 @@ pkgname=postmarketos-ui-hildon
 pkgver=1
 pkgrel=4
 pkgdesc="(X11) Lightweight GTK+2 UI (optimized for single-touch touchscreens)"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="GPL3+"
 depends="
diff --git a/aports/main/postmarketos-ui-weston/APKBUILD b/aports/main/postmarketos-ui-weston/APKBUILD
index 32bc8e86..30162c6c 100644
--- a/aports/main/postmarketos-ui-weston/APKBUILD
+++ b/aports/main/postmarketos-ui-weston/APKBUILD
@@ -2,7 +2,7 @@ pkgname=postmarketos-ui-weston
 pkgver=4
 pkgrel=4
 pkgdesc="(Wayland) Reference compositor (demo, not a phone interface)"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="GPL3+"
 depends="weston-clients weston weston-shell-desktop weston-backend-fbdev
diff --git a/aports/main/postmarketos-update-kernel/APKBUILD b/aports/main/postmarketos-update-kernel/APKBUILD
index 7c11ca2c..8b6f60f6 100644
--- a/aports/main/postmarketos-update-kernel/APKBUILD
+++ b/aports/main/postmarketos-update-kernel/APKBUILD
@@ -2,7 +2,7 @@ pkgname=postmarketos-update-kernel
 pkgver=0.0.3
 pkgrel=0
 pkgdesc="kernel updater script for postmarketOS"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 depends="util-linux"
 source="update-kernel.sh"
 arch="noarch"
diff --git a/aports/main/watchdog-kick/APKBUILD b/aports/main/watchdog-kick/APKBUILD
index aaf5f629..43308891 100644
--- a/aports/main/watchdog-kick/APKBUILD
+++ b/aports/main/watchdog-kick/APKBUILD
@@ -2,7 +2,7 @@ pkgname=watchdog-kick
 pkgver=0.1
 pkgrel=0
 pkgdesc="Periodically kich watchdogs"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="GPL2"
 install="$pkgname.post-install"
diff --git a/pmb/build/qemu_workaround_aarch64.py b/pmb/build/qemu_workaround_aarch64.py
index 5dd029b8..d787ca17 100644
--- a/pmb/build/qemu_workaround_aarch64.py
+++ b/pmb/build/qemu_workaround_aarch64.py
@@ -26,7 +26,7 @@ def qemu_workaround_aarch64(args, suffix="buildroot_aarch64"):
     from the archives it generates in some cases. We build a patched abuild-tar,
     which avoids the bug.
 
-    https://github.com/postmarketOS/pmbootstrap/issues/546
+    https://gitlab.com/postmarketOS/pmbootstrap/issues/546
     """
     pkgname = "abuild-aarch64-qemu-workaround"
     pmb.build.package(args, pkgname, "aarch64", True,
diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py
index 3f6d34a6..5463e7fc 100644
--- a/pmb/config/__init__.py
+++ b/pmb/config/__init__.py
@@ -66,7 +66,7 @@ defaults = {
     "hostname": "",
     # A higher value is typically desired, but this can lead to VERY long open
     # times on slower devices due to host systems being MUCH faster than the
-    # target device: <https://github.com/postmarketOS/pmbootstrap/issues/429>
+    # target device (see issue #429).
     "iter_time": "200",
     "jobs": str(multiprocessing.cpu_count() + 1),
     "kernel": "stable",
diff --git a/pmb/helpers/other.py b/pmb/helpers/other.py
index 7cdca322..fbbbdbb7 100644
--- a/pmb/helpers/other.py
+++ b/pmb/helpers/other.py
@@ -28,8 +28,7 @@ def folder_size(args, path):
     """
     Run `du` to calculate the size of a folder (this is less code and
     faster than doing the same task in pure Python). This result is only
-    approximatelly right, but good enough for pmbootstrap's use case:
-    <https://github.com/postmarketOS/pmbootstrap/pull/760>
+    approximatelly right, but good enough for pmbootstrap's use case (#760).
 
     :returns: folder size in bytes
     """
@@ -51,16 +50,8 @@ def check_grsec(args):
     if not os.path.exists(path):
         return
 
-    link = "https://github.com/postmarketOS/pmbootstrap/issues/107"
     raise RuntimeError("You're running a kernel based on the grsec"
-                       " patchset. At the moment, pmbootstrap is not"
-                       " compatible with grsec or a hardened kernel, sorry!"
-                       " To get pmbootstrap working, you will need to switch"
-                       " to a vanilla kernel (i.e. non-hardened and without grsec)."
-                       " Alternatively, it would be awesome if you want to add"
-                       " support for hardened/grsec kernels, please see this for"
-                       " more details: <" + link + ">")
-
+                       " patchset. This is not supported.")
 
 def check_binfmt_misc(args):
     """
@@ -105,8 +96,7 @@ def migrate_work_folder(args):
     if current == 0:
         # Ask for confirmation
         logging.info("Changelog:")
-        logging.info("* Building chroots have a different username: "
-                     "<https://github.com/postmarketOS/pmbootstrap/issues/709>")
+        logging.info("* Building chroots have a different username (#709)")
         logging.info("Migration will do the following:")
         logging.info("* Zap your chroots")
         logging.info("* Adjust '" + args.work + "/config_abuild/abuild.conf'")
diff --git a/pmb/install/_install.py b/pmb/install/_install.py
index ff6f1e1e..05fa33b3 100644
--- a/pmb/install/_install.py
+++ b/pmb/install/_install.py
@@ -61,8 +61,7 @@ def get_subpartitions_size(args):
     # /dev/installp2
     full = root - home
 
-    # Add some free space, see also:
-    # https://github.com/postmarketOS/pmbootstrap/pull/336
+    # Add some free space, see also: #336
     full *= 1.20
     full += 50 * 1024 * 1024
     boot += 15 * 1024 * 1024
diff --git a/test/test_folder_size.py b/test/test_folder_size.py
index 3660cc83..93fe5b9e 100644
--- a/test/test_folder_size.py
+++ b/test/test_folder_size.py
@@ -49,8 +49,7 @@ def test_get_folder_size(args, tmpdir):
 
     # Check if the size is correct. Unfortunately, the `du` call
     # in pmb.helpers.other.folder_size is not very accurate, so we
-    # allow 10kb of tolerance (good enough for our use case):
-    # <https://github.com/postmarketOS/pmbootstrap/pull/760>
+    # allow 10kb of tolerance (good enough for our use case): #760
     tolerance = 10240
     size = 204800 * files
     result = pmb.helpers.other.folder_size(args, tmpdir)
diff --git a/test/testdata/init_questions_device/aports/device/device-lg-mako/APKBUILD b/test/testdata/init_questions_device/aports/device/device-lg-mako/APKBUILD
index 55323be7..1637b53b 100644
--- a/test/testdata/init_questions_device/aports/device/device-lg-mako/APKBUILD
+++ b/test/testdata/init_questions_device/aports/device/device-lg-mako/APKBUILD
@@ -4,7 +4,7 @@ pkgname=device-lg-mako
 pkgver=2
 pkgrel=16
 pkgdesc="Google Nexus 4"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="linux-lg-mako mkbootimg mesa-dri-swrast"
diff --git a/test/testdata/init_questions_device/aports/device/device-sony-amami/APKBUILD b/test/testdata/init_questions_device/aports/device/device-sony-amami/APKBUILD
index 8100afb1..aa663b26 100644
--- a/test/testdata/init_questions_device/aports/device/device-sony-amami/APKBUILD
+++ b/test/testdata/init_questions_device/aports/device/device-sony-amami/APKBUILD
@@ -2,7 +2,7 @@ pkgname=device-sony-amami
 pkgver=2
 pkgrel=0
 pkgdesc="Sony Xperia Z1 Compact"
-url="https://github.com/postmarketOS"
+url="https://postmarketos.org"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base mkbootimg mdss-fb-init-hack mesa-dri-swrast"