diff --git a/main/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD
index 17536e76cb69530e34ce8ee60ea3feb9bfdfc4fc..8282927dfbb56553043a587d565405d03e6e73a7 100644
--- a/main/acf-alpine-baselayout/APKBUILD
+++ b/main/acf-alpine-baselayout/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for alpine-baselayout"
 url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua lua-json4 lua-posix"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-alpine-conf/APKBUILD b/main/acf-alpine-conf/APKBUILD
index 3c27241b434c254752844dfb41660874ec0f281e..87cfe0bbf549f83165b6f40efa2f0c2b55bc31ea 100644
--- a/main/acf-alpine-conf/APKBUILD
+++ b/main/acf-alpine-conf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for alpine-conf"
 url="http://git.alpinelinux.org/cgit/acf-alpine-conf"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua lua-posix openssl"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-amavisd-new/APKBUILD b/main/acf-amavisd-new/APKBUILD
index 7902891fcca84d9b0b76d76d1d582ad672bdd005..5d47dcff3a4aa23ab3f31de2999160ec5575098d 100644
--- a/main/acf-amavisd-new/APKBUILD
+++ b/main/acf-amavisd-new/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ACF module for amavis"
 url="http://git.alpinelinux.org/cgit/acf-amavisd-new"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua amavisd-new"
 makedepends=""
 install=
diff --git a/main/acf-apk-tools/APKBUILD b/main/acf-apk-tools/APKBUILD
index a39a7838aeaf893bc9675df14bbb2ccc1ef59a09..4d7796b98a3938a7e67681683c77fc9cede6273f 100644
--- a/main/acf-apk-tools/APKBUILD
+++ b/main/acf-apk-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ACF module for apk"
 url="http://git.alpinelinux.org/cgit/acf-apk-tools"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua lua-posix apk-tools"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-asterisk/APKBUILD b/main/acf-asterisk/APKBUILD
index 91ab744519bec395446351d5f7dfc1002c2ef7d4..9360b98b7f72e96b571c34137c47359ab6e750d6 100644
--- a/main/acf-asterisk/APKBUILD
+++ b/main/acf-asterisk/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for asterisk"
 url="http://git.alpinelinux.org/cgit/acf-asterisk"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua asterisk"
 makedepends=""
 install=
diff --git a/main/acf-awall/APKBUILD b/main/acf-awall/APKBUILD
index b186e3dcf1b51f6d0f2d0972ccfe421757dab452..b52b7378ec50fb670d67dfcfc14ccfd71cb71fc7 100644
--- a/main/acf-awall/APKBUILD
+++ b/main/acf-awall/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ACF for Alpine Wall"
 url="http://git.alpinelinux.org/cgit/acf-awall"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua awall"
 makedepends=""
 install=
diff --git a/main/acf-chrony/APKBUILD b/main/acf-chrony/APKBUILD
index 247f48f250a9112b7d1740a100f4d66ba9416990..b3f9a7bf7a97b4a594055bbe194e1f27307e24a4 100644
--- a/main/acf-chrony/APKBUILD
+++ b/main/acf-chrony/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for chrony"
 url="http://git.alpinelinux.org/cgit/acf-chrony"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua lua-posix chrony"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-clamav/APKBUILD b/main/acf-clamav/APKBUILD
index b4e14a439fa58f073c3a4fb8929ce73f9ddf6ef7..2ddd320dfea52c40771b9b6258e93ead904dc0b7 100644
--- a/main/acf-clamav/APKBUILD
+++ b/main/acf-clamav/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for clamav"
 url="http://git.alpinelinux.org/cgit/acf-clamav"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua clamav"
 makedepends=""
 install=
diff --git a/main/acf-clamsmtp/APKBUILD b/main/acf-clamsmtp/APKBUILD
index b3db2c1e3e872b3e385472f66ceda90e66a0c911..caf37f5fe408a863ca4da4d517f1d90961c0c9bb 100644
--- a/main/acf-clamsmtp/APKBUILD
+++ b/main/acf-clamsmtp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for clamsmtp"
 url="http://git.alpinelinux.org/cgit/acf-clamsmtp"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua clamsmtp"
 makedepends=""
 install=
diff --git a/main/acf-core/APKBUILD b/main/acf-core/APKBUILD
index 1a21e016b1fa8ded074dc6124384ab9fca084a79..ae22cd06835a99432c889eb20b3fd1ab68f41334 100644
--- a/main/acf-core/APKBUILD
+++ b/main/acf-core/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface framework"
 url="http://git.alpinelinux.org/cgit/acf-core"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 install="$pkgname.post-upgrade"
 depends="acf-jquery acf-lib acf-skins haserl-lua$_luaversion lua$_luaversion
 	lua$_luaversion-posix lua$_luaversion-md5 lua$_luaversion-json4
diff --git a/main/acf-dansguardian/APKBUILD b/main/acf-dansguardian/APKBUILD
index 371d38403dd16f7f9d47cde24d5fb7fb72e2e381..43abc3ca48a6990e3a956a3d033eda91300cb2a6 100644
--- a/main/acf-dansguardian/APKBUILD
+++ b/main/acf-dansguardian/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for dansguardian"
 url="http://git.alpinelinux.org/cgit/acf-dansguardian"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua dansguardian"
 makedepends=""
 install=
diff --git a/main/acf-db/APKBUILD b/main/acf-db/APKBUILD
index a80706f61d74181af9d0b52db40f6b9b9fece381..9155a22dd62d8a27d4ece0346f5e0c5ea9306b98 100644
--- a/main/acf-db/APKBUILD
+++ b/main/acf-db/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for databases"
 url="http://git.alpinelinux.org/cgit/acf-db"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua acf-db-lib"
 makedepends=""
 install=
diff --git a/main/acf-dhcp/APKBUILD b/main/acf-dhcp/APKBUILD
index 988256dc11aa1f87312a49a3d0371ac38a53bda5..d49630b91ce1f3fbf71bfe30736bf2f6c82d4092 100644
--- a/main/acf-dhcp/APKBUILD
+++ b/main/acf-dhcp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for dhcp"
 url="http://git.alpinelinux.org/cgit/acf-dhcp"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua dhcp"
 makedepends=""
 install=
diff --git a/main/acf-dnscache/APKBUILD b/main/acf-dnscache/APKBUILD
index 45a6dbe7f42be04eae7804d81300912eee3b935d..2e2fc63e1de645da2985229b9b1c2aef22c9c35b 100644
--- a/main/acf-dnscache/APKBUILD
+++ b/main/acf-dnscache/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for dnscache"
 url="http://git.alpinelinux.org/cgit/acf-dnscache"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua lua-posix dnscache"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD
index 0ee3f940abe3084a55b3fb9f58e18111320e7d4c..02cbc23498e2dc3c2b926f62d925ea0c9c6292e5 100644
--- a/main/acf-dnsmasq/APKBUILD
+++ b/main/acf-dnsmasq/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for dnsmasq"
 url="http://git.alpinelinux.org/cgit/acf-dnsmasq"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua dnsmasq"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-dovecot/APKBUILD b/main/acf-dovecot/APKBUILD
index af4b0b7c7f7d5ebf7ec78c4709fd28abaf242299..88f7ee580403559bee930a2b2dcded09ac557633 100644
--- a/main/acf-dovecot/APKBUILD
+++ b/main/acf-dovecot/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for dovecot"
 url="http://git.alpinelinux.org/cgit/acf-dovecot"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua dovecot"
 makedepends=""
 install=
diff --git a/main/acf-fetchmail/APKBUILD b/main/acf-fetchmail/APKBUILD
index 6a1fdef71d7970d5ce7df7e1dc11fbd091a1838d..e5ad60bda576b2c5b86acb30f1667addcb61d857 100644
--- a/main/acf-fetchmail/APKBUILD
+++ b/main/acf-fetchmail/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for fetchmail"
 url="http://git.alpinelinux.org/cgit/acf-fetchmail"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua fetchmail"
 makedepends=""
 install=
diff --git a/main/acf-freeradius3/APKBUILD b/main/acf-freeradius3/APKBUILD
index 38c83f22b527f9771bd9e342f278089d1e81c7a9..b5a66bf6128e22c651548d106b5e429da8552394 100644
--- a/main/acf-freeradius3/APKBUILD
+++ b/main/acf-freeradius3/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ACF for freeradius 3"
 url="http://git.alpinelinux.org/cgit/acf-freeradius3"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua freeradius3"
 makedepends=""
 install=
diff --git a/main/acf-freeswitch-vmail/APKBUILD b/main/acf-freeswitch-vmail/APKBUILD
index 9ab4a44927e1d37b696f98fa93be3da7e906d566..13cca1fe71d7d93decc1e29be92692cf87770dbf 100644
--- a/main/acf-freeswitch-vmail/APKBUILD
+++ b/main/acf-freeswitch-vmail/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ACF for a web interface for freeswitch voicemail"
 url="http://git.alpinelinux.org/cgit/$pkgname"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua lua-sql-sqlite3 lua-socket freeswitch"
 makedepends=""
 install="$pkgname.post-upgrade"
diff --git a/main/acf-freeswitch/APKBUILD b/main/acf-freeswitch/APKBUILD
index eb13368a80a36e530810b8b0fb957021ebd13878..fd0777ca0f4c714c4fc1ddd5ea093cd6c1a3c02f 100644
--- a/main/acf-freeswitch/APKBUILD
+++ b/main/acf-freeswitch/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="ACF for freeswitch"
 url="http://git.alpinelinux.org/cgit/acf-freeswitch"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua freeswitch"
 makedepends=""
 install=
diff --git a/main/acf-gross/APKBUILD b/main/acf-gross/APKBUILD
index df7b525ee2cbfd75549b436a6db5fa5869a8db52..2a1465ae82658d4516d65f1ed93b16b03b5f54d1 100644
--- a/main/acf-gross/APKBUILD
+++ b/main/acf-gross/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for gross"
 url="http://git.alpinelinux.org/cgit/acf-gross"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua gross"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-heimdal/APKBUILD b/main/acf-heimdal/APKBUILD
index 57a367ec776ce9aac8e437d721842f7d2da24a88..ccb3c0797e05c2f149fdebf71398e33d9eac8408 100644
--- a/main/acf-heimdal/APKBUILD
+++ b/main/acf-heimdal/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ACF module for heimdal"
 url="http://git.alpinelinux.org/cgit/$pkgname"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua heimdal"
 makedepends=""
 install=
diff --git a/main/acf-iproute2-qos/APKBUILD b/main/acf-iproute2-qos/APKBUILD
index 8c97351433bebf6cb55a74b42b89e12546e509f5..1676226bff8aba53a90f1829af085dcb7c1527dd 100644
--- a/main/acf-iproute2-qos/APKBUILD
+++ b/main/acf-iproute2-qos/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ACF module for iproute2-qos"
 url="http://git.alpinelinux.org/cgit/$pkgname"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua iproute2-qos acf-alpine-baselayout>=0.5.7"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-ipsec-tools/APKBUILD b/main/acf-ipsec-tools/APKBUILD
index f091bbd066153250789d40720e6d828bc86e201b..96c82ecfde0a83219480f0cada37ed8423421e18 100644
--- a/main/acf-ipsec-tools/APKBUILD
+++ b/main/acf-ipsec-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for ipsec-tools"
 url="http://git.alpinelinux.org/cgit/acf-ipsec-tools"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua ipsec-tools"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-iptables/APKBUILD b/main/acf-iptables/APKBUILD
index 25b0c0aaf4c63b2503070cd2852c12fb6f936a03..0babbc9f9b1c98a05e59bc1e2ba408371cd1a493 100644
--- a/main/acf-iptables/APKBUILD
+++ b/main/acf-iptables/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for iptables"
 url="http://git.alpinelinux.org/cgit/acf-iptables"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua iptables"
 makedepends=""
 install=
diff --git a/main/acf-jquery/APKBUILD b/main/acf-jquery/APKBUILD
index 45a634b54fced7c0291a5f35ba1e55db5f6cb8a6..52efe4cdd2d87009abb51f5d86677ba06ada964e 100644
--- a/main/acf-jquery/APKBUILD
+++ b/main/acf-jquery/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="jquery libraries for ACF"
 url="http://git.alpinelinux.org/cgit/acf-jquery"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends=""
 replaces="acf-core"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-kamailio/APKBUILD b/main/acf-kamailio/APKBUILD
index ddcbadeec7627997069a17a6ad282b07d5fda96c..581caf2c06aa4bd0fbf2b57f5cd0e54d3057be79 100644
--- a/main/acf-kamailio/APKBUILD
+++ b/main/acf-kamailio/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for kamailio"
 url="http://git.alpinelinux.org/cgit/acf-kamailio"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua kamailio acf-db-lib"
 makedepends="acf-db-lib"
 install=
diff --git a/main/acf-lib/APKBUILD b/main/acf-lib/APKBUILD
index dc77f1036a6af7691cd7dae1e92a8c2a41a4890d..f4f882cab8481aca74efee428f5bb4c21f6833dc 100644
--- a/main/acf-lib/APKBUILD
+++ b/main/acf-lib/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Lua libraries for ACF"
 url="http://git.alpinelinux.org/cgit/acf-lib"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="lua-subprocess"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-lighttpd/APKBUILD b/main/acf-lighttpd/APKBUILD
index 10ba8437acdacc71f292a15db68ebc48808af1fd..46222f097988566738b9330f4d67c9bf4cc64b41 100644
--- a/main/acf-lighttpd/APKBUILD
+++ b/main/acf-lighttpd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for lighttpd"
 url="http://git.alpinelinux.org/cgit/acf-lighttpd"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua lighttpd"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-lvm2/APKBUILD b/main/acf-lvm2/APKBUILD
index 03ff3c4f9cfa77d9a224470b808590b229d3a006..ce7447c839e4a5b22d8867bee9cf0250c31cb81d 100644
--- a/main/acf-lvm2/APKBUILD
+++ b/main/acf-lvm2/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ACF module for lvm2"
 url="http://git.alpinelinux.org/cgit/$pkgname"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua lvm2"
 makedepends=""
 install=
diff --git a/main/acf-mariadb/APKBUILD b/main/acf-mariadb/APKBUILD
index e68909c8f9f3e28c585f76c9e5e3336cf8cb8711..f6e78d21f71074c931da28081b4f09155b6cc7ae 100644
--- a/main/acf-mariadb/APKBUILD
+++ b/main/acf-mariadb/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ACF module for mariadb"
 url="http://git.alpinelinux.org/cgit/$pkgname"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua mariadb mariadb-client lua-sql-mysql acf-db-lib"
 makedepends="acf-db-lib"
 install=
diff --git a/main/acf-mdadm/APKBUILD b/main/acf-mdadm/APKBUILD
index 259abdb85dfd91dd4594db114bd1288909fc60ee..0b7e322fff7878f06349cbaaebba5a5008082c42 100644
--- a/main/acf-mdadm/APKBUILD
+++ b/main/acf-mdadm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ACF module for mdadm"
 url="http://git.alpinelinux.org/cgit/$pkgname"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua mdadm"
 makedepends=""
 install=
diff --git a/main/acf-openldap/APKBUILD b/main/acf-openldap/APKBUILD
index 71ebe23f68bd47108e7e80643eafec1de082bb0e..89457a2c4fdbc81f70958d04f44a331ff8df9844 100644
--- a/main/acf-openldap/APKBUILD
+++ b/main/acf-openldap/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="ACF module for OpenLDAP"
 url="http://git.alpinelinux.org/cgit/alacerda/$pkgname/"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua openldap openldap-back-bdb"
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/acf-opennhrp/APKBUILD b/main/acf-opennhrp/APKBUILD
index 4b94407a569780f0377403f1b3789e0107231687..c326b3cb2356af49d7185e5c86825c048ea864d0 100644
--- a/main/acf-opennhrp/APKBUILD
+++ b/main/acf-opennhrp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for opennhrp"
 url="http://git.alpinelinux.org/cgit/acf-opennhrp"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua lua-posix opennhrp"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-openntpd/APKBUILD b/main/acf-openntpd/APKBUILD
index a4e044356933ad715d2d9057c97eaa41d5aed612..94ce468d60ce1e42fdc10aa8963aed4f242242cb 100644
--- a/main/acf-openntpd/APKBUILD
+++ b/main/acf-openntpd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for openntpd"
 url="http://git.alpinelinux.org/cgit/acf-openntpd"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua openntpd"
 makedepends=""
 install=
diff --git a/main/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD
index a4704ca6538b22ee19588ce586ff6c5fd4af04ca..9dee78d630fb0aa2f1006887b83bd38d491a444d 100644
--- a/main/acf-openssh/APKBUILD
+++ b/main/acf-openssh/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for openssh"
 url="http://git.alpinelinux.org/cgit/acf-openssh"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua openssh"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-openssl/APKBUILD b/main/acf-openssl/APKBUILD
index 9facd929f07a6c0d697c76d6ab3755599b878b76..cc74dd2fa547cb9dad3fa178944337204002976d 100644
--- a/main/acf-openssl/APKBUILD
+++ b/main/acf-openssl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for openssl"
 url="http://git.alpinelinux.org/cgit/acf-openssl"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua openssl"
 makedepends=""
 install=
diff --git a/main/acf-openvpn/APKBUILD b/main/acf-openvpn/APKBUILD
index 33ae18bee975038752633bab455b7a6b21df41ce..7bac2b422c4346dd8fb21f3eb58b4f7d5709d307 100644
--- a/main/acf-openvpn/APKBUILD
+++ b/main/acf-openvpn/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for openvpn"
 url="http://git.alpinelinux.org/cgit/acf-openvpn"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua openvpn"
 makedepends=""
 install=
diff --git a/main/acf-pingu/APKBUILD b/main/acf-pingu/APKBUILD
index 427263ffbade5cae45ca77486b485b6d32cb817b..268ba9392631542a9d3d1d58ae57ad2ee0a5b9ec 100644
--- a/main/acf-pingu/APKBUILD
+++ b/main/acf-pingu/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for pingu"
 url="http://git.alpinelinux.org/cgit/acf-pingu"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua pingu"
 makedepends=""
 install=
diff --git a/main/acf-postfix/APKBUILD b/main/acf-postfix/APKBUILD
index e3a8c297ff115e0641eeb8bfd5bb3620013e3da2..ff889844b414a7d0ebc4ae650681544f49f20371 100644
--- a/main/acf-postfix/APKBUILD
+++ b/main/acf-postfix/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for postfix"
 url="http://git.alpinelinux.org/cgit/acf-postfix"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua postfix"
 makedepends=""
 install=
diff --git a/main/acf-postgresql/APKBUILD b/main/acf-postgresql/APKBUILD
index 68f7e18caa62e173f7cc8dd0981540cda871d1a9..4de14b9951dddb1d23a7e8ee2f914631ca847453 100644
--- a/main/acf-postgresql/APKBUILD
+++ b/main/acf-postgresql/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ACF module for postgresql"
 url="http://git.alpinelinux.org/cgit/$pkgname"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua postgresql acf-db-lib lua-sql-postgres"
 makedepends="acf-db-lib"
 install=
diff --git a/main/acf-ppp/APKBUILD b/main/acf-ppp/APKBUILD
index e311f14f6c9739c4ad726e4a455ea7d690b67c1f..8ccb84ce7302a9dd57b3b4c25039feab030a560f 100644
--- a/main/acf-ppp/APKBUILD
+++ b/main/acf-ppp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for ppp"
 url="http://git.alpinelinux.org/cgit/acf-ppp"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua ppp"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-provisioning/APKBUILD b/main/acf-provisioning/APKBUILD
index 23b7bf8c82e92699768080733cf2622bc7681125..c1e89eff850eed06c96f28c2c5a162333b4ff73c 100644
--- a/main/acf-provisioning/APKBUILD
+++ b/main/acf-provisioning/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="ACF for provisioning templated configs to devices"
 url="http://git.alpinelinux.org/cgit/acf-provisioning"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua lua-sql-postgres postgresql-client lua-posixtz"
 makedepends=""
 install=""
diff --git a/main/acf-quagga/APKBUILD b/main/acf-quagga/APKBUILD
index 977ed544a6be5169fea7b9ddfbd5e7e888ad1b3f..fd7f57b658d4ccf575c48d0a58ea4222317842f7 100644
--- a/main/acf-quagga/APKBUILD
+++ b/main/acf-quagga/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for quagga"
 url="http://git.alpinelinux.org/cgit/acf-quagga"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua quagga"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-samba/APKBUILD b/main/acf-samba/APKBUILD
index e5f9dd83840300d2958cf25458ca9249bc2d7388..f82cf203a0d0730f8e2c86c48b3e52462cf2e8a3 100644
--- a/main/acf-samba/APKBUILD
+++ b/main/acf-samba/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for samba"
 url="http://git.alpinelinux.org/cgit/acf-samba"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua samba"
 makedepends=""
 install=
diff --git a/main/acf-skins/APKBUILD b/main/acf-skins/APKBUILD
index 737e88b48d87157701cd04535a8134727fed42a8..c1573b438a9f927e640616247804185fb9197083 100644
--- a/main/acf-skins/APKBUILD
+++ b/main/acf-skins/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Skins for ACF"
 url="http://git.alpinelinux.org/cgit/acf-skins"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends=""
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-snort/APKBUILD b/main/acf-snort/APKBUILD
index cc3731056dff02ae93ee8affcf1affb84e8ef013..51d7c3ba6ff4a85bfbe5d3785d55986b9c05113e 100644
--- a/main/acf-snort/APKBUILD
+++ b/main/acf-snort/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for snort"
 url="http://git.alpinelinux.org/cgit/acf-snort"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua snort"
 makedepends=""
 install=
diff --git a/main/acf-squid/APKBUILD b/main/acf-squid/APKBUILD
index ab1bd0d1e5cf090a1e6d05989e8ddc27f3089811..be6d959222cfcbc554d9e7b9c1515495d11c131f 100644
--- a/main/acf-squid/APKBUILD
+++ b/main/acf-squid/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for squid"
 url="http://git.alpinelinux.org/cgit/acf-squid"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua squid"
 makedepends=""
 install=
diff --git a/main/acf-tcpproxy/APKBUILD b/main/acf-tcpproxy/APKBUILD
index d3c30f87d9cf89bd4987ca3ae8124ced1cb0970e..dba6b7b001f15fa8c388e85eb3a9741cd5777756 100644
--- a/main/acf-tcpproxy/APKBUILD
+++ b/main/acf-tcpproxy/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for tcpproxy"
 url="http://git.alpinelinux.org/cgit/acf-tcpproxy"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua tcpproxy"
 makedepends=""
 install=
diff --git a/main/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD
index 82fce53afdac4c977f881e66491752beabe4975d..1e2506a871cd343f158699c04a00190305023d45 100644
--- a/main/acf-tinydns/APKBUILD
+++ b/main/acf-tinydns/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for tinydns"
 url="http://git.alpinelinux.org/cgit/acf-tinydns"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua tinydns"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-unbound/APKBUILD b/main/acf-unbound/APKBUILD
index fb8921d1a0b3f0e8e93a1a0c2cd6643f5a8b0171..aa0e882e8807a011fd3fe53b06073e7ba433887e 100644
--- a/main/acf-unbound/APKBUILD
+++ b/main/acf-unbound/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for unbound"
 url="http://git.alpinelinux.org/cgit/$pkgname"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua unbound"
 replaces=""
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-vlc-daemon/APKBUILD b/main/acf-vlc-daemon/APKBUILD
index 7c26f9b0646a501fecd202ba83f85450882377c0..5952fb1fa118fef762d97fd7884e513fecf51ce2 100644
--- a/main/acf-vlc-daemon/APKBUILD
+++ b/main/acf-vlc-daemon/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for vlc"
 url="http://git.alpinelinux.org/cgit/acf-vlc-daemon"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua vlc-daemon"
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD
index aab002cfc10d1c9921ebe4db4edef4d6fcd586be..92f8a58f0ee92d30827c7de557be2f3f37cdbf95 100644
--- a/main/acf-weblog/APKBUILD
+++ b/main/acf-weblog/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ACF for web proxy (squid and dansguardian) logfiles"
 url="http://git.alpinelinux.org/cgit/acf-weblog"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-core lua lua-sql-postgres wget postgresql-client lua-subprocess"
 makedepends=""
 install="$pkgname.post-upgrade"
diff --git a/main/apk-cron/APKBUILD b/main/apk-cron/APKBUILD
index 7c085f99b94c0c89ba3be1fbf9ffa2e565c161f3..05bbff6823c07525e46fecec88bf4b492df921bb 100644
--- a/main/apk-cron/APKBUILD
+++ b/main/apk-cron/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Periodic software updates"
 url=http://git.alpinelinux.org/cgit/aports/tree/testing/apk-cron
 arch=noarch
-license=GPL-2
+license=GPL2
 depends=apk-tools
 source=apk
 
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 2d3c43a15f1bfdd3bc2c9aa6581040e451a3707b..b061647b08acdaa442f0e8c607bdf648036f5ff9 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -18,7 +18,7 @@ source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
 
 url="http://git.alpinelinux.org/cgit/apk-tools/"
 arch="all"
-license=GPL-2
+license=GPL2
 
 _builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index 24cbfd193a2e7ab7111ba5ddb9ac300151ca66be..39c2fe78acea1ed701659498b0ee1d6ca222f6cc 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Init scripts for busybox daemons"
 url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="busybox"
 makedepends=""
 install=$pkgname.post-install
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 1f810f87529879f2ffb17c168871afc28dfeccb8..c54854083cf07dee1a5c621dbbbabc27a2471f7f 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=9
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="linux-headers"
 install="$pkgname.post-install $pkgname.post-upgrade"
diff --git a/main/daq/APKBUILD b/main/daq/APKBUILD
index 622e8400817ef9fc1c723d1e86de92131d2055cf..281dcfc21ddb9654d4acccca2c714563377c4ea8 100644
--- a/main/daq/APKBUILD
+++ b/main/daq/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Data Acquisition library - packet I/O library"
 url="http://www.snort.org/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="libpcap-dev flex bison"
 install=""
diff --git a/main/distcc/APKBUILD b/main/distcc/APKBUILD
index e6a05f4cdffaa75cb22f0f7336eefdc513b999ab..ea0198fb64f4e66ddac0bf084b3d4568aed2b9b6 100644
--- a/main/distcc/APKBUILD
+++ b/main/distcc/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=9
 pkgdesc="A distributed C, C++, Obj C compiler"
 url="http://distcc.org"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="popt-dev python-dev"
 source="http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index 4c0706650b166c77e91d5bdc742a43ee42a85439..40477bdf0eaec2e0387215a07979e8f7723fee89 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Small forwarding DNS server"
 url="http://www.thekelleys.org.uk/dnsmasq/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="linux-headers"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
diff --git a/main/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
index c3391c1e544648846ff65c670c3fd8dab59edec8..ce58ddc3d16cde40e492e0e79c3b4a1d4eeb36f0 100644
--- a/main/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="World's most popular Open Source IRC bot"
 url="http://www.eggheads.org/"
 arch="all"
-license='GPL-2'
+license='GPL2'
 depends="tcl"
 makedepends="tcl-dev !bind-libs"
 install=
diff --git a/main/espeak/APKBUILD b/main/espeak/APKBUILD
index 1a3e521749ddb56dfa5df27a4545a428885a902b..c94e503ac6aaf941e0a203b12fc1455fefdb9f00 100644
--- a/main/espeak/APKBUILD
+++ b/main/espeak/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Speech synthesizer for English and other languages"
 url="http://espeak.sourceforge.net/"
 arch="all"
-license="GPL-3"
+license="GPL3"
 subpackages="$pkgname-dev"
 depends=
 makedepends=
diff --git a/main/exo/APKBUILD b/main/exo/APKBUILD
index 8ee4fb9e6e2380b5e036e1627d37e7f4beb333f3..ab5d794d247d4fea0c4887825904d7d0ce87e2ab 100644
--- a/main/exo/APKBUILD
+++ b/main/exo/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Extensions to Xfce by os-cillation"
 url="http://www.os-cillation.com/article.php?sid=40"
 arch="all"
-license="GPL-2 LGPL-2"
+license="GPL2 LGPL-2"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends="hicolor-icon-theme"
 depends_dev="gtk+2.0-dev libxfce4util-dev"
diff --git a/main/fastjar/APKBUILD b/main/fastjar/APKBUILD
index 6faf5840a195263214c2cabf8992e03810b70d6c..31cc92a1360f23ef0887e0107cd4842bdbd36b3e 100644
--- a/main/fastjar/APKBUILD
+++ b/main/fastjar/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A fast implementation of Java Archiver"
 url="http://savannah.nongnu.org/projects/fastjar"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="zlib-dev"
 install=""
diff --git a/main/garcon/APKBUILD b/main/garcon/APKBUILD
index bd0c111cd03a3d967fea0606ab0f4a3f24f24485..23af32e9ef57f7d2f022737c54577a2ccb8e42e2 100644
--- a/main/garcon/APKBUILD
+++ b/main/garcon/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="a freedesktop.org compliant menu implementation based on GLib and GIO"
 url="http://www.xfce.org/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends=
 depends_dev="glib-dev gtk+2.0-dev libxfce4ui-dev"
diff --git a/main/gdnsd/APKBUILD b/main/gdnsd/APKBUILD
index 2e8df069acf3a815e81e9c31ce452088f1115493..175d1f6123207b9a7142d57e74d5e06c9e8264b8 100644
--- a/main/gdnsd/APKBUILD
+++ b/main/gdnsd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Geographic Authoritative DNS server"
 url="https://github.com/blblack/gdnsd/"
 arch="all"
-license="GPL-3"
+license="GPL3"
 depends=""
 depends_dev=""
 makedepends="userspace-rcu-dev libev-dev libcap-dev ragel autoconf automake libtool"
diff --git a/main/gpicview/APKBUILD b/main/gpicview/APKBUILD
index a4c6f20c701801abf0d7327fa2ed1c45ebead533..aeacceaa3d999cb9a7e29f9e924113336a2382ef 100644
--- a/main/gpicview/APKBUILD
+++ b/main/gpicview/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Picture viewer of the LXDE Desktop"
 url="http://wiki.lxde.org/en/GPicView"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 subpackages="$pkgname-lang"
 makedepends="gtk+-dev intltool libjpeg-turbo-dev"
diff --git a/main/gtk-xfce-engine/APKBUILD b/main/gtk-xfce-engine/APKBUILD
index e9399f893722437894b79ab9cd5b0b1c1e9f53b2..f21241f3409159c080ed3410ad46a833ae537e93 100644
--- a/main/gtk-xfce-engine/APKBUILD
+++ b/main/gtk-xfce-engine/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Xfce theme engine"
 url="http://www.xfce.org/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="gtk+2.0-dev gtk+3.0-dev"
 source="http://archive.xfce.org/src/xfce/gtk-xfce-engine/${pkgver%.*}/gtk-xfce-engine-$pkgver.tar.bz2
diff --git a/main/installkernel/APKBUILD b/main/installkernel/APKBUILD
index 1c3b56f9d6ae1a794e7d92fd7409e2c968030e9c..3a5963d85f1d389b09f571b8b62b57b7c1e2dd2d 100644
--- a/main/installkernel/APKBUILD
+++ b/main/installkernel/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Alpine Linux Kernel install script"
 url="http://git.alpinelinux.org/cgit/aports/tree/main/installkernel"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 subpackages=""
 depends=""
 source="installkernel"
diff --git a/main/libaio/APKBUILD b/main/libaio/APKBUILD
index 5d3ba20a456246eb3d1a6fcefa9e9777e3d791cb..f1e44094e3a2397c889d422e194f708b786de1fd 100644
--- a/main/libaio/APKBUILD
+++ b/main/libaio/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Asynchronous input/output library"
 url="http://lse.sourceforge.net/io/aio.html"
 arch="all"
-license="LGPL-2"
+license="LGPL2"
 depends=
 makedepends="linux-headers"
 install=
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD
index cec47b1575259f2781b689f7eb5755b5830ac7b1..755b6d45b28e4fd9e2d781ba7c8f68a16716786b 100644
--- a/main/libc0.9.32/APKBUILD
+++ b/main/libc0.9.32/APKBUILD
@@ -7,7 +7,7 @@ _ver=${pkgver/_/-}
 pkgrel=27
 pkgdesc="C library for developing embedded Linux systems"
 url=http://uclibc.org
-license="LGPL-2"
+license="LGPL2"
 arch="all"
 options="!strip !libc_musl"
 makedepends="linux-headers"
diff --git a/main/libfprint/APKBUILD b/main/libfprint/APKBUILD
index 58415bb8bb670ddd88d279d06f9a67b3fed12df0..4c54bec355d04b5fe71d515eadbd8c7562ca7e31 100644
--- a/main/libfprint/APKBUILD
+++ b/main/libfprint/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="fingerprint reader and identification library"
 url="http://www.freedesktop.org/wiki/Software/fprint/libfprint"
 arch="all"
-license="LGPL-2.1"
+license="LGPL2.1"
 depends=""
 depends_dev="libusb-dev"
 makedepends="$depends_dev nss-dev glib-dev gdk-pixbuf-dev pixman-dev"
diff --git a/main/libnetfilter_acct/APKBUILD b/main/libnetfilter_acct/APKBUILD
index a09486a4b07dfafc2b9a3bb8d83b0d840cdab0f8..f6217a27d7fae98407d8edfc5398f42c0bd515c9 100644
--- a/main/libnetfilter_acct/APKBUILD
+++ b/main/libnetfilter_acct/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Userspace library providing interface to extended accounting infrastructure."
 url="http://www.netfilter.org/projects/libnetfilter_conntrack/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="libnfnetlink-dev libmnl-dev linux-headers"
 subpackages="$pkgname-dev"
diff --git a/main/libnetfilter_conntrack/APKBUILD b/main/libnetfilter_conntrack/APKBUILD
index 5a664ea5ec18b96d44355e82fa092ef30a497548..8c78156abf868bc9c7b51368ce79f75ca7764c30 100644
--- a/main/libnetfilter_conntrack/APKBUILD
+++ b/main/libnetfilter_conntrack/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="programming interface (API) to the in-kernel connection tracking state table"
 url="http://www.netfilter.org/projects/libnetfilter_conntrack/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="linux-headers libnfnetlink-dev libmnl-dev"
 subpackages="$pkgname-dev"
diff --git a/main/libnetfilter_log/APKBUILD b/main/libnetfilter_log/APKBUILD
index a3fd56b2695c20ed0bbc2bd72ffbc2455afeabbf..f028f08679856881c85de5e1088bedd2d4c34fc8 100644
--- a/main/libnetfilter_log/APKBUILD
+++ b/main/libnetfilter_log/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="interface to packets that have been logged by the kernel packet filter"
 url="http://www.netfilter.org/projects/libnetfilter_log/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 depends_dev="linux-headers"
 makedepends="$depends_dev libnfnetlink-dev"
diff --git a/main/libnfnetlink/APKBUILD b/main/libnfnetlink/APKBUILD
index d949cbdef0657fb8dee593ef77b9b6b94812d6e8..31878a239a8159f7af5381c7e1ba5cb022a3d38e 100644
--- a/main/libnfnetlink/APKBUILD
+++ b/main/libnfnetlink/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="low-level library for netfilter related kernel/userspace communication"
 url="http://www.netfilter.org/projects/libnfnetlink/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=""
 makedepends="linux-headers"
 subpackages="$pkgname-dev"
diff --git a/main/libnftnl/APKBUILD b/main/libnftnl/APKBUILD
index 0e27df82863203594afc0468be1398d377e75dc0..022cce657fc0d478738d3be4d4e266821dd02072 100644
--- a/main/libnftnl/APKBUILD
+++ b/main/libnftnl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Netfilter library providing interface to the nf_tables subsystem"
 url="http://netfilter.org/projects/libnftnl/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=""
 depends_dev="libmnl-dev"
 makedepends="$depends_dev bash"
diff --git a/main/libspf2/APKBUILD b/main/libspf2/APKBUILD
index 0d8d7084436fd209ffcbb72f7a6317a466041f9b..213e7b8d7585779615df3b50f9a6378ebf77ee17 100644
--- a/main/libspf2/APKBUILD
+++ b/main/libspf2/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Sender Policy Framework library, a part of the SPF/SRS protocol pair."
 url="http://www.libspf2.org"
 arch="all"
-license="LGPL-2.1 BSD-2"
+license="LGPL2.1 BSD-2"
 subpackages="$pkgname-dev"
 makedepends="autoconf automake libtool"
 depends=
diff --git a/main/libxfce4util/APKBUILD b/main/libxfce4util/APKBUILD
index c92bd1a21fed26c70edf7bdafa58e724645d1603..e6b5b292c032039814b1a630f464caf068e6af85 100644
--- a/main/libxfce4util/APKBUILD
+++ b/main/libxfce4util/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Basic utility non-GUI functions for Xfce"
 url="http://www.xfce.org/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends=
 depends_dev="glib-dev"
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index a8a7d17032a434ecace30db582abcd69b7478864..efc2f69d7d98c2e8b7353759e37fcc2133ed4ae7 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -49,7 +49,7 @@ for _i in $source; do
 done
 
 arch="x86 x86_64 armhf"
-license="GPL-2"
+license="GPL2"
 
 prepare() {
 	local _patch_failed=
diff --git a/main/linux-headers/APKBUILD b/main/linux-headers/APKBUILD
index 12fe9818400ea9c1e25f6d9e51dee6b4379b97d9..9a4a5c470ff25fe2eac02af37c453cd3ed1316d5 100644
--- a/main/linux-headers/APKBUILD
+++ b/main/linux-headers/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Linux system headers"
 url="http://kernel.org"
 arch="all"
-license='GPL-2'
+license='GPL2'
 makedepends="perl"
 options="!strip !tracedeps"
 source="http://www.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz
diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD
index 4e102f077b4ce4b328e7f0616a651e8b02f4c3f5..1a055cda04e04d6a65f5b0a68005b269a1635a1b 100644
--- a/main/linux-rpi/APKBUILD
+++ b/main/linux-rpi/APKBUILD
@@ -39,7 +39,7 @@ for _i in $source; do
 done
 
 arch="armhf"
-license="GPL-2"
+license="GPL2"
 
 prepare() {
 	local _patch_failed=
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index 5f9d1552d540077ed78c5d217da0014827e03588..de4c871ab666967f2349d290b9741d4b6108c13e 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -27,7 +27,7 @@ if [ "${pkgver%.0}" = "$pkgver" ]; then
 fi
 subpackages="$pkgname-dev"
 arch="all"
-license="GPL-2"
+license="GPL2"
 
 _abi_release=${pkgver}
 
diff --git a/main/lua-json4/APKBUILD b/main/lua-json4/APKBUILD
index 9f2ff21b9fae33888f8a96ea0961c71dad9a3631..566ce5441e7c8351fbbe5f8e02c44fe9810ea52f 100644
--- a/main/lua-json4/APKBUILD
+++ b/main/lua-json4/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="JSON encoding / decoding module for Lua (JSON4lua)"
 url="https://github.com/craigmj/json4lua"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends=""
 subpackages=""
 for _i in $_luaversions; do
diff --git a/main/lua-xctrl/APKBUILD b/main/lua-xctrl/APKBUILD
index 23ad1baca59dfe6772605a1768197760d846b282..4f6b76414539fc4336926b0f15acc83e52578027 100644
--- a/main/lua-xctrl/APKBUILD
+++ b/main/lua-xctrl/APKBUILD
@@ -11,7 +11,7 @@ _luaversions="5.1 5.2 5.3"
 pkgdesc="Lua module that allows you to query and manipulate various aspects of an X11 window manager"
 url="https://github.com/yetanothergeek/xctrl"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="lua-dev libx11-dev libxmu-dev"
 for _i in $_luaversions; do
diff --git a/main/mdadm/APKBUILD b/main/mdadm/APKBUILD
index a89807d1c98d509722952f484ee047a553f193a8..1c02a34358a34bf8e922f6c83e84481ab337f046 100644
--- a/main/mdadm/APKBUILD
+++ b/main/mdadm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="a tool for managing Linux Software RAID arrays"
 url="http://neil.brown.name/blog/mdadm"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="groff linux-headers"
 subpackages="$pkgname-doc"
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 65f7a5952e53f73f8c636e549b868f29746e9d06..be8a44fdc040ce2fcc6b29b2efec51cd07f27d8b 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -13,7 +13,7 @@ source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz
 	0001-improve-default-config.patch
 	"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 
 _builddir="$srcdir"/$pkgname-$_ver
 prepare() {
diff --git a/main/mpc1/APKBUILD b/main/mpc1/APKBUILD
index 8a4b52041d445a6a9ab3e3ea539d49a31525cb36..68ad50bf7a1c94c628b4bf4f3ef5d1ad53527f4b 100644
--- a/main/mpc1/APKBUILD
+++ b/main/mpc1/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Multiprecision C library"
 url="http://www.multiprecision.org/"
 arch="all"
-license="LGPL-2.1"
+license="LGPL2.1"
 depends=
 makedepends_host="gmp-dev mpfr-dev"
 makedepends="$makedepends_host"
diff --git a/main/multisort/APKBUILD b/main/multisort/APKBUILD
index 9c2479b8ee36d1df76c7408769b348d4e16633a8..bacdce514c54a62895213a26bf64b410124900ce 100644
--- a/main/multisort/APKBUILD
+++ b/main/multisort/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Tool to merge multiple logfiles"
 url="http://www.xach.com/multisort/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends=""
 install=""
diff --git a/main/nagios-plugins/APKBUILD b/main/nagios-plugins/APKBUILD
index 73b7bb22a4b2afd83c97016e9b8ed041221c0020..3fb9c3d3af790287c6e91a45ee9c3c9c379f0263 100644
--- a/main/nagios-plugins/APKBUILD
+++ b/main/nagios-plugins/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Plugins for Nagios to check services on hosts"
 url="http://nagiosplugins.org"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends="fping net-snmp-tools bind-tools nrpe-plugin perl-net-snmp"
 makedepends="net-snmp-tools openssl-dev openldap-dev mariadb-dev postgresql-dev libpq
 	linux-headers"
diff --git a/main/nagios/APKBUILD b/main/nagios/APKBUILD
index 727ee1d2e793969eb4fb3526e9bdbb8290c9d8cc..1db5e740e091c482891a291f9098223b33fe7b4c 100644
--- a/main/nagios/APKBUILD
+++ b/main/nagios/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Popular monitoring tool"
 url="http://www.nagios.org/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends="perl"
 install="$pkgname.pre-install"
 makedepends="gd-dev perl-dev libpng-dev libjpeg perl-net-snmp"
diff --git a/main/newt/APKBUILD b/main/newt/APKBUILD
index 7d12c7866d3cbc1863502a3b0b59bc8cbc2a5144..fe7ad26f701b7f32475f3b712d4e66a9450707ac 100644
--- a/main/newt/APKBUILD
+++ b/main/newt/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Redhat's Newt windowing toolkit development files"
 url="https://fedorahosted.org/newt/"
 arch="all"
-license="LGPL-2"
+license="LGPL2"
 depends=
 makedepends="slang-dev popt-dev python-dev ncurses-dev"
 subpackages="$pkgname-dev $pkgname-doc py-newt:py"
diff --git a/main/nftables/APKBUILD b/main/nftables/APKBUILD
index 8794931974913a71030adf0c41f7f21a06f74673..2c939392e4d419a35119547fc6456bb3e18aa89d 100644
--- a/main/nftables/APKBUILD
+++ b/main/nftables/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Netfilter tables userspace tools"
 url="http://netfilter.org/projects/nftables/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=""
 depends_dev="libmnl-dev libnftnl-dev gmp-dev readline-dev ncurses-dev"
 makedepends="$depends_dev bison flex"
diff --git a/main/nspr/APKBUILD b/main/nspr/APKBUILD
index 25a2192d7f6c6c2a5aef376769fa52b64f2040de..36bd9b2d3d095e8593f9b9fb547cb32f5a25b635 100644
--- a/main/nspr/APKBUILD
+++ b/main/nspr/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Netscape Portable Runtime"
 url="http://www.mozilla.org/projects/nspr/"
 arch="all"
-license="MPL-1.1 GPL-2 LGPL-2.1"
+license="MPL-1.1 GPL2 LGPL-2.1"
 depends=
 # -dev package does not ship any symlinks so dependency cannot be autodetected
 depends_dev="nspr"
diff --git a/main/open-iscsi/APKBUILD b/main/open-iscsi/APKBUILD
index 20d5fe47d59d91e3244b1759842b261567a3fbd6..50eb92a988c5f551eb97de513c318aeb6c4b6267 100644
--- a/main/open-iscsi/APKBUILD
+++ b/main/open-iscsi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="High performance, transport independent, multi-platform iSCSI initiator"
 url="http://www.open-iscsi.org"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="openssl-dev linux-headers"
 install=""
diff --git a/main/openjdk7/APKBUILD b/main/openjdk7/APKBUILD
index 0325f10fa66833d3ff8bb0dd6ed4658958498c8d..31e84420aa1b728f3a5978b502ffafe44c9f7181 100644
--- a/main/openjdk7/APKBUILD
+++ b/main/openjdk7/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=0
 pkgdesc="Sun OpenJDK 7 via IcedTea"
 url="http://icedtea.classpath.org/"
 arch="all"
-license="GPL-2 with Classpath"
+license="GPL2 with Classpath"
 depends="$pkgname-jre"
 options="sover-namecheck"
 makedepends="bash findutils tar zip file paxmark gawk util-linux libxslt
diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index 4aeb664f012041c20c3f2b77d5c9d04b32f24c9e..a8ceae72cffc6a67d8dc59359991a26807ef50b2 100644
--- a/main/opennhrp/APKBUILD
+++ b/main/opennhrp/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=6
 pkgdesc="NBMA Next Hop Resolution Protocol daemon"
 url="http://sourceforge.net/projects/opennhrp"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="c-ares-dev linux-headers"
 subpackages="$pkgname-doc"
diff --git a/main/orage/APKBUILD b/main/orage/APKBUILD
index a79c94c5ee40651f36191c25611237ea9cee8d97..0ebdf991fc68c480fe43764e3e003d9b5a809613 100644
--- a/main/orage/APKBUILD
+++ b/main/orage/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A simple calendar application with reminders for Xfce"
 url="http://www.xfce.org/projects/orage/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 subpackages="$pkgname-doc $pkgname-lang"
 depends="hicolor-icon-theme"
 makedepends="xfce4-panel-dev libnotify-dev libxfce4ui-dev libical-dev popt-dev"
diff --git a/main/paxctl/APKBUILD b/main/paxctl/APKBUILD
index 9ca5861bbfaa494564d936aea774944fd4055ee0..80ecc5ebbc1f40e83e5e4e8d5935a9489a749e1e 100644
--- a/main/paxctl/APKBUILD
+++ b/main/paxctl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Manage PaX releated program header flags"
 url="http://pax.grsecurity.net"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=""
 makedepends=""
 install=
diff --git a/main/perl/APKBUILD b/main/perl/APKBUILD
index aac1fed3bf4322e702b20bd08c6be7ff745eb865..d933a803b2cf1d51cff0ffca737d9c05525f4999 100644
--- a/main/perl/APKBUILD
+++ b/main/perl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Larry Wall's Practical Extraction and Report Language"
 url=http://www.perl.org
 arch="all"
-license="Artistic GPL-2"
+license="Artistic GPL2"
 source="http://www.cpan.org/src/5.0/perl-$pkgver.tar.gz
 	"
 options="!fhs"
diff --git a/main/pflogsumm/APKBUILD b/main/pflogsumm/APKBUILD
index 72e65f56be5dc4f7e1c1285ed553dfb4bed27440..7a552187d3b0cda90d0c4555ccd3f0c0bfc6303a 100644
--- a/main/pflogsumm/APKBUILD
+++ b/main/pflogsumm/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Pflogsumm is a log analyzer for Postfix logs" 
 url="http://jimsun.linxnet.com/postfix_contrib.html" 
 arch="noarch"
-license="GPL-2" 
+license="GPL2" 
 depends="perl perl-date-calc sysklogd"
 makedepends=""
 subpackages="$pkgname-doc" 
diff --git a/main/pth/APKBUILD b/main/pth/APKBUILD
index e2c109ee1b87e43169be6a0e3f753b7dc9b090aa..36676dde563fe17dbfa7a66f266ce2577f8fc422 100644
--- a/main/pth/APKBUILD
+++ b/main/pth/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=4
 pkgdesc="The GNU Portable Threads."
 url="http://www.gnu.org/software/pth"
 arch="all"
-license="LGPL-2.1"
+license="LGPL2.1"
 depends=""
 subpackages="$pkgname-dev $pkgname-doc"
 options="!libc_musl"
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD
index 4b21a4d2ed31ed5cc3720b7ca401748533d4f41d..2bc3bd84f8caabea72ac495be7cf29a7f9edb567 100644
--- a/main/qemu/APKBUILD
+++ b/main/qemu/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="QEMU is a generic machine emulator and virtualizer"
 url="http://qemu.org/"
 arch="all"
-license="GPL-2 LGPL-2"
+license="GPL2 LGPL-2"
 makedepends="zlib-dev alsa-lib-dev gnutls-dev ncurses-dev glib-dev
 	libjpeg-turbo-dev libpng-dev vde2-dev spice-dev paxmark curl-dev
 	libcap-dev libcap-ng-dev libaio-dev usbredir-dev util-linux-dev
diff --git a/main/quagga-nhrp/APKBUILD b/main/quagga-nhrp/APKBUILD
index 2825e09c3638113ab6956536154e295734446fd5..21f594ee2d0f81707660574fe8be61d78ce8f48f 100644
--- a/main/quagga-nhrp/APKBUILD
+++ b/main/quagga-nhrp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF, BGP and NHRP."
 url="http://git.alpinelinux.org/cgit/user/tteras/quagga/commit/?h=nhrp"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends="iproute2"
 makedepends="gawk texinfo perl autoconf automake libtool c-ares-dev
 	linux-headers readline-dev ncurses-dev net-snmp-dev libcap-dev"
diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD
index 69a1d8f4eb9a031f96706d3c90df495caca08749..841c251c7d92bcadf8787e97d488eae64a9dedab 100644
--- a/main/quagga/APKBUILD
+++ b/main/quagga/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=3
 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP."
 url="http://quagga.net/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends="iproute2"
 makedepends="linux-headers readline-dev ncurses-dev gawk texinfo perl net-snmp-dev"
 install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade"
diff --git a/main/racktables/APKBUILD b/main/racktables/APKBUILD
index 5ce309f1d25799dc68dda44df91006fb0900abc7..1e806d570c1baddfb67db82318ae113b2b926f08 100644
--- a/main/racktables/APKBUILD
+++ b/main/racktables/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Server room asset management"
 url="http://racktables.org"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="php php-bcmath php-gd php-mysql php-pdo_mysql php-json"
 depends_dev=
 makedepends="$depends_dev"
diff --git a/main/ristretto/APKBUILD b/main/ristretto/APKBUILD
index 5ac96fe3b96231e4842d6f7a0d14d1cf39b265d3..c7c0c78b5ad0fd80685d52c87df3ddcd6f97846d 100644
--- a/main/ristretto/APKBUILD
+++ b/main/ristretto/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Ristretto is a image viewer for Xfce"
 url="http://goodies.xfce.org/projects/applications/ristretto"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends="desktop-file-utils hicolor-icon-theme"
 makedepends="libxfce4ui-dev dbus-glib-dev libexif-dev thunar-dev"
 install=
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD
index 6b18ad3c6405bb777bf74798cba90cb9a52ceea9..55c2ba7a747b37f87c9e4dc39b764a0997450814 100644
--- a/main/rsyslog/APKBUILD
+++ b/main/rsyslog/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="Enhanced multi-threaded syslogd with database support and more."
 url="http://www.rsyslog.com/"
 arch="all"
-license="GPLv3 LGPL-3"
+license="GPLv3 LGPL3"
 makedepends="zlib-dev gnutls-dev mariadb-dev postgresql-dev net-snmp-dev
 	libnet-dev libgcrypt-dev libee-dev libestr-dev liblogging-dev
 	json-c-dev util-linux-dev py-docutils"
diff --git a/main/scstadmin/APKBUILD b/main/scstadmin/APKBUILD
index c1ddb748928b7aa2132581e1540d59cb38a166da..a6f2bde87b29a4d57721f5c1e1ea271d8ca08862 100644
--- a/main/scstadmin/APKBUILD
+++ b/main/scstadmin/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="SCST administration tool written in perl"
 url="http://scst.sourceforge.net"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="perl"
 makedepends="perl-dev"
 install=
diff --git a/main/shorewall-core/APKBUILD b/main/shorewall-core/APKBUILD
index b6f227692cd636638ae77d952dbe255c276435cd..5b48320e52e3edd7f41719e0e1299dcb835e26cc 100644
--- a/main/shorewall-core/APKBUILD
+++ b/main/shorewall-core/APKBUILD
@@ -12,7 +12,7 @@ pkgrel=0
 pkgdesc="Core libraries for Shorewall"
 url="http://www.shorewall.net/"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends=""
 # coreutils for install -T
 makedepends="coreutils bash"
diff --git a/main/shorewall/APKBUILD b/main/shorewall/APKBUILD
index 3bfe177c37a9b41e04e3eaa65cf5f4735c56eecc..bcf6abecf7e16303ab24a99aff68b889dbd42a09 100644
--- a/main/shorewall/APKBUILD
+++ b/main/shorewall/APKBUILD
@@ -12,7 +12,7 @@ pkgrel=0
 pkgdesc="An iptables front end for firewall configuration"
 url="http://www.shorewall.net/"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="shorewall-core perl iptables iproute2"
 # coreutils for install -T
 makedepends="coreutils bash"
diff --git a/main/shorewall6/APKBUILD b/main/shorewall6/APKBUILD
index ca843d889cb465b4e2d4d4ce6df7d34b762c4809..79f84232beddac01199e2e438c77cd5c67454f2a 100644
--- a/main/shorewall6/APKBUILD
+++ b/main/shorewall6/APKBUILD
@@ -12,7 +12,7 @@ pkgrel=0
 pkgdesc="Files for the IPV6 Shorewall Firewall"
 url="http://www.shorewall.net/"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="shorewall-core perl ip6tables iproute2"
 # coreutils for install -T
 makedepends="coreutils bash"
diff --git a/main/sircbot/APKBUILD b/main/sircbot/APKBUILD
index c025b217ee61da91e3a94432a3fa66b64a52c01f..bffa0a05cbcb7b5f771a5136c26c34dfb41c363a 100644
--- a/main/sircbot/APKBUILD
+++ b/main/sircbot/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Minimalistic IRC bot"
 url="http://git.alpinelinux.org/cgit/sircbot/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 pkgusers="sircbot"
 pkggroups="sircbot"
 depends=
diff --git a/main/slim/APKBUILD b/main/slim/APKBUILD
index a02beb8df2dd98b8a4daed22e6b2acd7a371614a..0de7778fe5d6eb14f4936ceea09756e8b1d445b0 100644
--- a/main/slim/APKBUILD
+++ b/main/slim/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
 pkgdesc="Desktop-independent graphical login manager for X11"
 url="http://slim.berlios.de/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 subpackages="$pkgname-doc"
 makedepends="libxmu-dev libpng-dev libjpeg-turbo-dev libxft-dev
 	cmake libxrandr-dev consolekit-dev"
diff --git a/main/sntpc/APKBUILD b/main/sntpc/APKBUILD
index 4520b745d8f5b9997da92a7af25bb1b657c8a7f2..2dc1bb7d26ef046d7199f290a79125b468fe62f0 100644
--- a/main/sntpc/APKBUILD
+++ b/main/sntpc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
 pkgdesc="Simple NTP client"
 url="http://git.alpinelinux.org/cgit/sntpc"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 source="http://git.alpinelinux.org/cgit/sntpc.git/snapshot/sntpc-$pkgver.tar.bz2
 	sntpc.initd
diff --git a/main/squark/APKBUILD b/main/squark/APKBUILD
index 8d9d9e9833cc709baaa6cc6e0ae4ce4839cecc40..053391e5d70663bc827b984f4a21f17c1451c681 100644
--- a/main/squark/APKBUILD
+++ b/main/squark/APKBUILD
@@ -10,7 +10,7 @@ source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
 	"
 url="http://git.alpinelinux.org/cgit/squark/"
 arch="all"
-license=GPL-2
+license=GPL2
 install="$pkgname.post-install"
 
 prepare() {
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index 60a0a0238b02aa4b32e1106f154630b54e70f524..f0643f640b5924a90412c800159db408c672a19c 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -9,7 +9,7 @@ install="squid.pre-install squid.pre-upgrade"
 pkgusers="squid"
 pkggroups="squid"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends="logrotate"
 makedepends="openssl-dev perl-dev autoconf automake heimdal-dev libtool
 	libcap-dev linux-headers"
diff --git a/main/ssmtp/APKBUILD b/main/ssmtp/APKBUILD
index 928fd19841db75b4ce5c15e8227b1cb9fb45b407..0c795ec4cc404ba7aec9faf7710ee7d53df84a0a 100644
--- a/main/ssmtp/APKBUILD
+++ b/main/ssmtp/APKBUILD
@@ -8,7 +8,7 @@ pkgdesc="Extremely simple MTA to get mail off the system to a mail hub"
 subpackages="$pkgname-doc"
 arch="all"
 url="https://packages.debian.org/stable/mail/ssmtp"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="openssl-dev autoconf"
 install=
diff --git a/main/strongswan/APKBUILD b/main/strongswan/APKBUILD
index 1c196e24ca00bfe1d1b45980ee45aa3ed8a04ec6..f6affdf4c17530de2595402d7273b52b5b9e31be 100644
--- a/main/strongswan/APKBUILD
+++ b/main/strongswan/APKBUILD
@@ -9,7 +9,7 @@ url="http://www.strongswan.org/"
 arch="all"
 pkgusers="ipsec"
 pkggroups="ipsec"
-license="GPL-2 RSA-MD5 RSA-PKCS11 DES"
+license="GPL2 RSA-MD5 RSA-PKCS11 DES"
 depends="iproute2 openssl"
 depends_dev="sqlite-dev openssl-dev curl-dev gmp-dev libcap-dev"
 makedepends="$depends_dev linux-headers python"
diff --git a/main/uwsgi/APKBUILD b/main/uwsgi/APKBUILD
index 86362eb77b4a63a23d6e2fa8bc9011b4e252de04..0ed6ea92d2be2abeab7f7ae27666ef03820bd92f 100644
--- a/main/uwsgi/APKBUILD
+++ b/main/uwsgi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="uWSGI application container server"
 url=http://projects.unbit.it/uwsgi/
 arch=all
-license=GPL-2
+license=GPL2
 depends=mailcap
 makedepends="linux-headers lua5.2-dev python python-dev zeromq-dev paxmark
 	pcre-dev python3 python3-dev"
diff --git a/main/xfce4-appfinder/APKBUILD b/main/xfce4-appfinder/APKBUILD
index a163d2188ef666d00e08dd3eff12625faa170edf..e167ffed137f6d5f327cb4db0e66ebdead39a464 100644
--- a/main/xfce4-appfinder/APKBUILD
+++ b/main/xfce4-appfinder/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Xfce application finder"
 url="http://www.xfce.org/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends="hicolor-icon-theme"
 makedepends="thunar-dev gtk+-dev libxfce4ui-dev garcon-dev"
 subpackages="$pkgname-lang"
diff --git a/main/xfce4-battery-plugin/APKBUILD b/main/xfce4-battery-plugin/APKBUILD
index 4a15f888cbc3a1a53e2c86c87f6554df61b8deb3..3b27e688ea5d1fd41201542477f5770a015ac38e 100644
--- a/main/xfce4-battery-plugin/APKBUILD
+++ b/main/xfce4-battery-plugin/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="A battery monitor plugin for the Xfce panel"
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
 arch="all"
-license="GPL-2"
+license="GPL2"
 makedepends="xfce4-panel-dev libxfce4ui-dev perl-xml-parser intltool
 	linux-headers"
 install=
diff --git a/main/xfce4-panel/APKBUILD b/main/xfce4-panel/APKBUILD
index 36e7b4e8b511132fa031726ec56326fcbbc047f6..dc44715d1c1cffec882d228a18b3f14b8cbacf6c 100644
--- a/main/xfce4-panel/APKBUILD
+++ b/main/xfce4-panel/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Panel for the Xfce desktop environment"
 url="http://www.xfce.org/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends="hicolor-icon-theme"
 depends_dev="libxfce4util-dev gtk+2.0-dev"
diff --git a/main/xfce4-settings/APKBUILD b/main/xfce4-settings/APKBUILD
index cfc363cc47af7c40f3220eb82b7c0a22b9b79426..ffed0ea4a47e4deb5c94bb91f6dcacbc63b7e99d 100644
--- a/main/xfce4-settings/APKBUILD
+++ b/main/xfce4-settings/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Settings manager for xfce"
 url="http://www.xfce.org/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 subpackages="$pkgname-lang"
 makedepends="libxfce4ui-dev exo-dev libxi-dev libxrandr-dev libxklavier-dev
diff --git a/main/xfce4-taskmanager/APKBUILD b/main/xfce4-taskmanager/APKBUILD
index fb68c4813323a4260fd50e6777730e79b9917087..0255097e01fb8a5d92fee5352692870eed33bfc1 100644
--- a/main/xfce4-taskmanager/APKBUILD
+++ b/main/xfce4-taskmanager/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="a simple taskmanager for the Xfce Desktop Environment"
 url="http://goodies.xfce.org/projects/applications/xfce4-taskmanager"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="libxfce4ui-dev"
 subpackages="$pkgname-lang"
diff --git a/main/xfce4-terminal/APKBUILD b/main/xfce4-terminal/APKBUILD
index 45c6e2bf6148464d6bfc61ec544c87d0ae171cc7..632b3381489726d1b50d81620460d1f454511d00 100644
--- a/main/xfce4-terminal/APKBUILD
+++ b/main/xfce4-terminal/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
 url="http://www.xfce.org/projects/terminal/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 subpackages="$pkgname-doc $pkgname-lang"
 depends="startup-notification hicolor-icon-theme"
 makedepends="exo-dev vte-dev libxfce4ui-dev"
diff --git a/main/xfconf/APKBUILD b/main/xfconf/APKBUILD
index ad694ab091afbff8457ca5cdee725be0fb7d075e..40ecf6638dddfb4f51eec6a6116ca83733af3411 100644
--- a/main/xfconf/APKBUILD
+++ b/main/xfconf/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Hierarchical configuration system for Xfce"
 url="http://www.xfce.org/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends=
 depends_dev="glib-dev dbus-dev dbus-glib-dev"
diff --git a/main/xfdesktop/APKBUILD b/main/xfdesktop/APKBUILD
index e533d813549bf478e3dcb00d9d0a9cc394e718fe..a5ffe3360e373f91166ab9bb6633f663bc20244a 100644
--- a/main/xfdesktop/APKBUILD
+++ b/main/xfdesktop/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A desktop manager for Xfce"
 url="http://www.xfce.org/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 subpackages="$pkgname-doc $pkgname-lang"
 depends="hicolor-icon-theme"
 makedepends="garcon-dev thunar-dev libxfce4ui-dev libwnck-dev libnotify-dev
diff --git a/main/xfwm4/APKBUILD b/main/xfwm4/APKBUILD
index dd446c60bb347c957c2632e3ddc68b247af76da5..c54ca2ebe5e4cce6dca108f729fe1cb3735a27e7 100644
--- a/main/xfwm4/APKBUILD
+++ b/main/xfwm4/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3"
 url="http://www.xfce.org/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends="hicolor-icon-theme"
 subpackages="$pkgname-lang"
 makedepends="libxfce4ui-dev libwnck-dev libxrandr-dev libxcomposite-dev
diff --git a/testing/acf-jquery-mobile/APKBUILD b/testing/acf-jquery-mobile/APKBUILD
index 69a7358028b0839cdeb0451072138c9b284fc585..ff482f06984ddf225c9cd9b62745fa076f0afd55 100644
--- a/testing/acf-jquery-mobile/APKBUILD
+++ b/testing/acf-jquery-mobile/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="jquery mobile libraries for ACF"
 url="http://git.alpinelinux.org/cgit/acf-jquery-mobile"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-jquery"
 replaces=""
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/testing/acf-skins-jqmobile/APKBUILD b/testing/acf-skins-jqmobile/APKBUILD
index ea8796f83316dd9a766880f1dcd1e4355db947b6..7260a4c4e23ffba558a5eae04a69ab549f1035de 100644
--- a/testing/acf-skins-jqmobile/APKBUILD
+++ b/testing/acf-skins-jqmobile/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ACF skin based upon jquery mobile"
 url="http://git.alpinelinux.org/cgit/acf-skins-jqmobile"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="acf-skins acf-jquery-mobile"
 replaces=""
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/testing/apts/APKBUILD b/testing/apts/APKBUILD
index 0f5648d4868ed97b942b667b6393ed6bfbaa4ae1..f729e732f8c18d3345cc5e6a139fa78edcbad2f0 100644
--- a/testing/apts/APKBUILD
+++ b/testing/apts/APKBUILD
@@ -10,7 +10,7 @@ source="http://git.alpinelinux.org/cgit/jbilyk/$pkgname.git/snapshot/$pkgname-$p
 	"
 url="http://git.alpinelinux.org/cgit/jbilyk/apts.git/"
 arch="noarch"
-license=GPL-2
+license=GPL2
 
 build() {
 	echo "Nothing to build, moving on to package"
diff --git a/testing/buildbot-slave/APKBUILD b/testing/buildbot-slave/APKBUILD
index ef3db390cc6a0edf7d6f67cfb0bfc5fcf49a872e..b934870258d0fb742ce11b2e70b980ca71861111 100644
--- a/testing/buildbot-slave/APKBUILD
+++ b/testing/buildbot-slave/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Buildbot slave daemon"
 url="http://buildbot.net/"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends="python py-twisted"
 depends_dev=""
 makedepends="python-dev py-setuptools"
diff --git a/testing/dspam/APKBUILD b/testing/dspam/APKBUILD
index 1ccdad243a90ca87b7bbf6a452cb08c4dbf35288..a34433cca4844a97a532617a2c4022987c28e862 100644
--- a/testing/dspam/APKBUILD
+++ b/testing/dspam/APKBUILD
@@ -9,7 +9,7 @@ url="http://dspam.nuclearelephant.com/"
 pkgusers="dspam"
 pkggroups="dspam"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 install="$pkgname.pre-install"
 makedepends="postgresql-dev sqlite-dev mariadb-dev autoconf automake libtool"
diff --git a/testing/gnump3d/APKBUILD b/testing/gnump3d/APKBUILD
index 11a2e88a9cdcbcca42103f5dcc32b6bf5b1858f9..7f16002ce93530df13f53c91e430b6036167037c 100644
--- a/testing/gnump3d/APKBUILD
+++ b/testing/gnump3d/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A streaming server for MP3, OGG vorbis and other streamable files"
 url="http://www.gnump3d.org/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends="perl"
 makedepends=""
 install=
diff --git a/testing/hardinfo/APKBUILD b/testing/hardinfo/APKBUILD
index 96d75b99377d8d88a9271a706fddac9a1739428c..968ba57d176e8ab4dd3e95fbf24efb8cb691b166 100644
--- a/testing/hardinfo/APKBUILD
+++ b/testing/hardinfo/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=5
 pkgdesc="A system information and benchmark tool."
 url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
 arch="all"
-license="GPL-2"
+license="GPL2"
 makedepends="gtk+-dev libsoup-dev>=2.4.0 gnutls-dev>=2.4.1"
 depends=
 source="http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.bz2
diff --git a/testing/kbuild/APKBUILD b/testing/kbuild/APKBUILD
index 4d5ad2f036581200f220ce2673d8c16b804c1906..e209cdcfc58566a47b0b3ff3b62d391ec35ea685 100644
--- a/testing/kbuild/APKBUILD
+++ b/testing/kbuild/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A makefile framework for writing simple makefiles for complex tasks"
 url="http://svn.netlabs.org/kbuild/wiki"
 arch="all"
-license="GPL-3"
+license="GPL3"
 depends=""
 depends_dev=""
 makedepends="autoconf automake flex bison"
diff --git a/testing/lightdm/APKBUILD b/testing/lightdm/APKBUILD
index df153fa9b725eb5bf47bf679e8a03e96380af5ba..9876d3f6133626dfbe50d563c7b428a2bd094392 100644
--- a/testing/lightdm/APKBUILD
+++ b/testing/lightdm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
 pkgdesc="A cross-desktop display manager"
 url="http://www.freedesktop.org/wiki/Software/LightDM"
 arch="all"
-license="GPL-3"
+license="GPL3"
 depends="dbus xinit accountsservice"
 depends_dev="glib-dev libxklavier-dev libx11-dev"
 makedepends="$depends_dev linux-pam-dev gtk+3.0-dev libxext-dev
diff --git a/testing/lua5.2-json4/APKBUILD b/testing/lua5.2-json4/APKBUILD
index fe4fd66e2364e3ea641aa784bafd6ff26f08f5ac..cf75f8b9fdaa6aac165f7843e6b6a0f8c2f2371a 100644
--- a/testing/lua5.2-json4/APKBUILD
+++ b/testing/lua5.2-json4/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="JSON encoding / decoding module for Lua $_luaver (JSON4lua)"
 url="http://json.luaforge.net/"
 arch="noarch"
-license="GPL-2"
+license="GPL2"
 depends=""
 source="http://files.luaforge.net/releases/json/json/$pkgver/json4lua-$pkgver.zip"
 
diff --git a/testing/lua5.2-xctrl/APKBUILD b/testing/lua5.2-xctrl/APKBUILD
index 68a1386783949f631cf2bfc7a152d6fbf30aaca8..39c608acc2db21f77fc216b83af141bc4c842be1 100644
--- a/testing/lua5.2-xctrl/APKBUILD
+++ b/testing/lua5.2-xctrl/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
 pkgdesc="Lua $_luaver module to query and manipulate X11 window managers"
 url="http://code.google.com/p/xctrl/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="lua$_luaver-dev libx11-dev libxmu-dev"
 install=
diff --git a/testing/lusca/APKBUILD b/testing/lusca/APKBUILD
index 661e3a43766f3b73a2d8f6ab3adf3a9a308287e1..f6902c2536694866e82c30284a9daff361483845 100644
--- a/testing/lusca/APKBUILD
+++ b/testing/lusca/APKBUILD
@@ -9,7 +9,7 @@ install="lusca.pre-install lusca.pre-upgrade"
 pkgusers="lusca"
 pkggroups="lusca"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends="logrotate"
 makedepends="openssl-dev perl-dev autoconf automake heimdal-dev libtool
 	libcap-dev linux-headers"
diff --git a/testing/madwimax/APKBUILD b/testing/madwimax/APKBUILD
index c3621388df4756c9492d7ccb3ee8afc85e5119e4..a06da00cd734d0b1b7e623a5cebbe753284b1eb1 100644
--- a/testing/madwimax/APKBUILD
+++ b/testing/madwimax/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="WiMAX driver for the Samsung SWC-U200 and similar USB modems"
 url="http://code.google.com/p/madwimax/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends="libusb-dev"
 install=
diff --git a/testing/postler/APKBUILD b/testing/postler/APKBUILD
index 12aa2604fb55e191e6b8249fb8a6ebcf751644f6..e8f3117388162b4ea51aea0a72f828b247fae964 100644
--- a/testing/postler/APKBUILD
+++ b/testing/postler/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Email client"
 url="https://launchpad.net/postler/"
 arch=""
-license="LGPL-2.1"
+license="LGPL2.1"
 depends="msmtp"
 makedepends="gtk+-dev webkit-dev libunique-dev libnotify-dev libcanberra-dev
 	python vala db-dev openssl-dev"
diff --git a/testing/ruby-mime-types/APKBUILD b/testing/ruby-mime-types/APKBUILD
index 09a1b3b07216912657e16cfa81bb19c453c44c70..fbbf3b3f8893c3350379a21a023294999c0216af 100644
--- a/testing/ruby-mime-types/APKBUILD
+++ b/testing/ruby-mime-types/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="The mime-types library provides a library and registry for information about MIME content type definitions"
 arch="noarch"
 url="https://github.com/mime-types/ruby-mime-types/"
-license="MIT 'Artistic 2.0' GPL-2"
+license="MIT 'Artistic 2.0' GPL2"
 depends="ruby"
 depends_dev=
 makedepends="$depends_dev"
diff --git a/testing/scummvm/APKBUILD b/testing/scummvm/APKBUILD
index 66c3f90c191c709146d28512587229fc18771c89..f4e7e84bb560027b5241228a1ebff582213840a1 100644
--- a/testing/scummvm/APKBUILD
+++ b/testing/scummvm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="engine for several graphical adventure games"
 url="http://www.scummvm.org/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=""
 makedepends="libogg-dev libvorbis-dev libtheora-dev zlib-dev
 	libpng-dev jpeg-dev glu-dev sdl-dev alsa-lib-dev freetype-dev"
diff --git a/unmaintained/fotoxx/APKBUILD b/unmaintained/fotoxx/APKBUILD
index e5ee47eae5b531476cce88c9041969a8f43ff673..8ac4baee6f13dd7fbb8ad613313727bf49faf092 100644
--- a/unmaintained/fotoxx/APKBUILD
+++ b/unmaintained/fotoxx/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Photo editing and collection management"
 url="http://kornelix.squarespace.com/fotoxx"
 arch="all"
-license="GPL-3"
+license="GPL3"
 depends="xdg-utils exiftool"
 makedepends="gtk+3.0-dev tiff-dev"
 install=
diff --git a/unmaintained/libsyncml/APKBUILD b/unmaintained/libsyncml/APKBUILD
index 550f4b40f4612107ed71aaeed032d2cf502e6911..09d45d67413272c78b6b9a11d6bc07961d9fc92e 100644
--- a/unmaintained/libsyncml/APKBUILD
+++ b/unmaintained/libsyncml/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Implementation of the SyncML protocol"
 url="http://libsyncml.opensync.org/"
 arch="all"
-license="LGPL-2.1"
+license="LGPL2.1"
 depends=
 makedepends="glib-dev libxml2-dev libwbxml-dev openobex-dev bluez-dev cmake"
 install=
diff --git a/unmaintained/wifidog/APKBUILD b/unmaintained/wifidog/APKBUILD
index ef84c458e04e5430ae6ad3db51397cd6a2018de0..caa4872051e54193f67af5a3191eb31153206817 100644
--- a/unmaintained/wifidog/APKBUILD
+++ b/unmaintained/wifidog/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="Wifi Captive Portal"
 url="http://dev.wifidog.org/"
 arch="all"
-license="GPL-2"
+license="GPL2"
 depends=
 makedepends=
 subpackages="$pkgname-doc"