diff --git a/community/osinfo-db/APKBUILD b/community/osinfo-db/APKBUILD
index 0e01315a11b5d49ae1bdbac8b4c73459d68c4c0a..90223414fb6108941f7d79e0cd3a75bce93c8a6c 100644
--- a/community/osinfo-db/APKBUILD
+++ b/community/osinfo-db/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=osinfo-db
 pkgver=20170423
-pkgrel=2
+pkgrel=3
 pkgdesc="osinfo database files"
 url="http://libosinfo.org/"
 arch="noarch"
@@ -23,19 +23,17 @@ check() {
 	osinfo-db-validate --dir "$builddir"
 }
 
-package() {
-	cd "$builddir"
-	osinfo-db-import --root "$pkgdir" \
-		--dir /usr/share/osinfo "$srcdir"/osinfo-db-$pkgver.tar.xz
-	mkdir -p "$pkgdir"/usr/share/osinfo/os/alpinelinux
-	cat > "$pkgdir"/usr/share/osinfo/os/alpinelinux/alpinelinux-3.6.xml<<EOF
+
+mk_xml() {
+	local ver="$1"
+	cat <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <libosinfo version="0.0.1">
 
-  <os id="http://alpinelinux.org/alpinelinux/3.6">
-    <short-id>alpinelinux3.6</short-id>
-    <name>Alpine Linux 3.6</name>
-    <version>3.6</version>
+  <os id="http://alpinelinux.org/alpinelinux/$ver">
+    <short-id>alpinelinux$ver</short-id>
+    <name>Alpine Linux $ver</name>
+    <version>$ver</version>
     <vendor>Alpine Linux Project</vendor>
     <family>linux</family>
     <distro>alpinelinux</distro>
@@ -49,18 +47,28 @@ package() {
     </resources>
     <media arch="i686">
       <iso>
-        <volume-id>alpine-.* 3.6.\d x86.*</volume-id>
+        <volume-id>alpine-.* $ver.\d.* x86.*</volume-id>
       </iso>
     </media>
     <media arch="x86_64">
       <iso>
-        <volume-id>alpine-.* 3.6.\d x86_64.*</volume-id>
+        <volume-id>alpine-.* $ver.\d.* x86_64.*</volume-id>
       </iso>
     </media>
   </os>
 </libosinfo>
 EOF
+}
 
+package() {
+	local ver=
+	cd "$builddir"
+	osinfo-db-import --root "$pkgdir" \
+		--dir /usr/share/osinfo "$srcdir"/osinfo-db-$pkgver.tar.xz
+	mkdir -p "$pkgdir"/usr/share/osinfo/os/alpinelinux.org
+	for ver in 3.6 3.7; do
+		mk_xml $ver > "$pkgdir"/usr/share/osinfo/os/alpinelinux.org/alpinelinux-$ver.xml
+	done
 }
 
 sha512sums="5ca13ced160f19dced65f3552e17a0379a47a05f1aa3bdd533550022f0023050b6cc1b43b2da6cff3fa10451f81560fbb0db241a11ed072b9f101db1bd301833  osinfo-db-20170423.tar.xz