diff --git a/maemo/gtk+2.0-maemo/APKBUILD b/maemo/gtk+2.0-maemo/APKBUILD
index 1efd641b4..dde50a417 100644
--- a/maemo/gtk+2.0-maemo/APKBUILD
+++ b/maemo/gtk+2.0-maemo/APKBUILD
@@ -1,6 +1,7 @@
 pkgname=gtk+2.0-maemo
 pkgver=2.24.31
-pkgrel=2
+_tag=2.24.25
+pkgrel=3
 subpkg=gtk-update-icon-cache
 pkgdesc="The GTK+ Toolkit (v2)"
 url="http://www.gtk.org/"
@@ -45,19 +46,20 @@ makedepends="
 	libxi-dev
 	zlib-dev
 	py-six"
+_repo_raw_url=https://raw.githubusercontent.com/maemo-leste/gtk
 source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
-	https://raw.githubusercontent.com/fremantle-gtk2/gtk/2.24.25-3m7%2Bmaemo/debian/patches/hildonize-gdk-window.diff
-	https://raw.githubusercontent.com/fremantle-gtk2/gtk/2.24.25-3m7%2Bmaemo/debian/patches/hildonize-gtk-container.diff
-	https://raw.githubusercontent.com/fremantle-gtk2/gtk/2.24.25-3m7%2Bmaemo/debian/patches/hildonize-gtk-dialog.diff
-	https://raw.githubusercontent.com/fremantle-gtk2/gtk/2.24.25-3m7%2Bmaemo/debian/patches/hildonize-gtk-entry.diff
-	https://raw.githubusercontent.com/fremantle-gtk2/gtk/2.24.25-3m7%2Bmaemo/debian/patches/hildonize-gtk-enums.diff
-	https://raw.githubusercontent.com/fremantle-gtk2/gtk/2.24.25-3m7%2Bmaemo/debian/patches/hildonize-gtk-iconview.diff
-	https://raw.githubusercontent.com/fremantle-gtk2/gtk/2.24.25-3m7%2Bmaemo/debian/patches/hildonize-gtk-imcontext.diff
-	https://raw.githubusercontent.com/fremantle-gtk2/gtk/2.24.25-3m7%2Bmaemo/debian/patches/hildonize-gtk-menu.diff
-	https://raw.githubusercontent.com/fremantle-gtk2/gtk/2.24.25-3m7%2Bmaemo/debian/patches/hildonize-gtk-rbtree.diff
-	https://raw.githubusercontent.com/fremantle-gtk2/gtk/2.24.25-3m7%2Bmaemo/debian/patches/hildonize-gtk-textview.diff
-	https://raw.githubusercontent.com/fremantle-gtk2/gtk/2.24.25-3m7%2Bmaemo/debian/patches/hildonize-gtk-widget.diff
-	https://raw.githubusercontent.com/fremantle-gtk2/gtk/2.24.25-3m7%2Bmaemo/debian/patches/hildonize-gtk-window.diff
+	$_repo_raw_url/$_tag/debian/patches/hildonize-gdk-window.diff
+	$_repo_raw_url/$_tag/debian/patches/hildonize-gtk-container.diff
+	$_repo_raw_url/$_tag/debian/patches/hildonize-gtk-dialog.diff
+	$_repo_raw_url/$_tag/debian/patches/hildonize-gtk-entry.diff
+	$_repo_raw_url/$_tag/debian/patches/hildonize-gtk-enums.diff
+	$_repo_raw_url/$_tag/debian/patches/hildonize-gtk-iconview.diff
+	$_repo_raw_url/$_tag/debian/patches/hildonize-gtk-imcontext.diff
+	$_repo_raw_url/$_tag/debian/patches/hildonize-gtk-menu.diff
+	$_repo_raw_url/$_tag/debian/patches/hildonize-gtk-rbtree.diff
+	$_repo_raw_url/$_tag/debian/patches/hildonize-gtk-textview.diff
+	$_repo_raw_url/$_tag/debian/patches/hildonize-gtk-widget.diff
+	$_repo_raw_url/$_tag/debian/patches/hildonize-gtk-window.diff
 	xid-collision-debug.patch
 	gtk2-fixdso.patch
 	hildonize-gtk-treeview.diff
diff --git a/maemo/hildon-desktop/APKBUILD b/maemo/hildon-desktop/APKBUILD
index bf7ad85f1..f576b57ac 100644
--- a/maemo/hildon-desktop/APKBUILD
+++ b/maemo/hildon-desktop/APKBUILD
@@ -1,10 +1,9 @@
 pkgname=hildon-desktop
 pkgver=2.2.155
-pkgrel=2
-_rev=c178acc6e7aa3524f962be6442335da8b89fc808
+pkgrel=3
 pkgdesc="Hildon desktop for Fremantle"
 arch="all"
-url="https://github.com/fremantle-gtk2/hildon-desktop"
+url="https://github.com/maemo-leste/hildon-desktop"
 license="GPL"
 depends="libhildon libmatchbox2 libhildondesktop clutter gnome-menus2 profiled"
 makedepends="
@@ -15,27 +14,27 @@ makedepends="
 	libmatchbox2-dev
 	mce-headers
 	profiled-dev"
-source="$pkgname-$_rev.tar.gz::https://github.com/fremantle-gtk2/hildon-desktop/archive/$_rev.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/hildon-desktop/archive/$pkgver.tar.gz"
 
-builddir="$srcdir/hildon-desktop-$_rev"
+builddir="$srcdir/hildon-desktop-$pkgver"
 
 prepare() {
 	cd "$builddir"
-    sed -i -e 's/libpng12/libpng/g' configure.ac
-    sed -i -e 's/g_return_if_fail (!render_manager->priv->zoomed);//g' src/home/hd-render-manager.c
-    # Temp workaround for top-left button to appear in QEMU x86_64
-    sed -i -e 's/MB_WM_OBJECT_TYPE(c)==HD_TYPE_TITLE_BAR/G_TYPE_CHECK_INSTANCE_TYPE(c, HD_TYPE_TITLE_BAR)/g' src/home/hd-title-bar.h
+	sed -i -e 's/libpng12/libpng/g' configure.ac
+	sed -i -e 's/g_return_if_fail (!render_manager->priv->zoomed);//g' src/home/hd-render-manager.c
+	# Temp workaround for top-left button to appear in QEMU x86_64
+	sed -i -e 's/MB_WM_OBJECT_TYPE(c)==HD_TYPE_TITLE_BAR/G_TYPE_CHECK_INSTANCE_TYPE(c, HD_TYPE_TITLE_BAR)/g' src/home/hd-title-bar.h
 }
 
 build() {
 	cd "$builddir"
-    ./autogen.sh
-    ./configure --prefix=/usr
-    make
+	./autogen.sh
+	./configure --prefix=/usr --sysconfdir=/etc
+	make
 }
 
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir/" install
 }
-sha512sums="277724771169b94ffba5836ce7010e0330b93c76b9d3c1ebbe192c3e834b9c9e873a9802642d3ab6166ef99ad0d5eb822965b816bba9e87294db7c1d8a069c29  hildon-desktop-c178acc6e7aa3524f962be6442335da8b89fc808.tar.gz"
+sha512sums="5cc45cbf9bc179298d1cdab860e5793922bc8768f5e636ddfbd4730eabef889d5c6f74d59668e982f762fe3d6c1e166071f246fa97d9fe6599ca18504ee87c40  hildon-desktop-2.2.155.tar.gz"
diff --git a/maemo/hildon-home/APKBUILD b/maemo/hildon-home/APKBUILD
new file mode 100644
index 000000000..e0913114d
--- /dev/null
+++ b/maemo/hildon-home/APKBUILD
@@ -0,0 +1,26 @@
+pkgname=hildon-home
+pkgver=0.3.71
+pkgrel=1
+pkgdesc="Hildon Home application"
+arch="all"
+url="https://github.com/maemo-leste/$pkgname"
+license="GPL"
+depends="libhildon"
+makedepends="libhildon-dev libhildondesktop-dev libosso-dev
+	hildon-thumbnail-dev libhildonfm-dev osso-bookmark-engine-dev
+	mce-headers sqlite-dev autoconf automake m4"
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/$pkgname/archive/$pkgver.tar.gz"
+
+builddir="$srcdir/$pkgname-$pkgver"
+
+build() {
+	cd "$builddir"
+	./autogen.sh --prefix=/usr CFLAGS="${CFLAGS} -Wno-error=deprecated-declarations -Wno-error=misleading-indentation"
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir/" install
+}
+sha512sums="2a7a9a2f6afa267b1d0e33aa95d2dd7afbdcc036cdf91572555f656d8cadc422f28dbe54ea2179b632ec180a3ac2bfa040f31192b23b8590d9e5ec7dbab3ab5d  hildon-home-0.3.71.tar.gz"
diff --git a/maemo/hildon-theme-alpha/APKBUILD b/maemo/hildon-theme-alpha/APKBUILD
index 99dfb6509..7c5d33c8e 100644
--- a/maemo/hildon-theme-alpha/APKBUILD
+++ b/maemo/hildon-theme-alpha/APKBUILD
@@ -3,7 +3,7 @@ pkgver=9.4
 pkgrel=2
 pkgdesc="Nokia Nseries Theme for Hildon"
 arch="noarch"
-url="https://github.com/fremantle-gtk2"
+url="https://github.com/maemo-leste"
 license="custom"
 _source_deb="hildon-theme-alpha_9.4+0m5_all.deb"
 source="http://repository.maemo.org/pool/fremantle/nokia-binaries/4bc37c7c77ebe90177c050b805a8dc79/nokia-binaries/h/hildon-theme-alpha/${_source_deb}"
diff --git a/maemo/hildon-thumbnail/0001-add-__NR_ioprio_set-for-aarch64-to-fix-compilation.patch b/maemo/hildon-thumbnail/0001-add-__NR_ioprio_set-for-aarch64-to-fix-compilation.patch
new file mode 100644
index 000000000..e8409732d
--- /dev/null
+++ b/maemo/hildon-thumbnail/0001-add-__NR_ioprio_set-for-aarch64-to-fix-compilation.patch
@@ -0,0 +1,29 @@
+From afd005ab4485d00d4b3af486daafe39e6e85b07f Mon Sep 17 00:00:00 2001
+From: NeKit <nekit1000@gmail.com>
+Date: Sat, 16 Dec 2017 22:00:36 +0300
+Subject: [PATCH] Add __NR_ioprio_set for aarch64 to fix compilation
+
+initialize_priority is disabled though, so ioprio_set should be never called
+---
+ daemon/hildon-thumbnail-daemon.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/daemon/hildon-thumbnail-daemon.c b/daemon/hildon-thumbnail-daemon.c
+index 9751d8c..f1401b9 100644
+--- a/daemon/hildon-thumbnail-daemon.c
++++ b/daemon/hildon-thumbnail-daemon.c
+@@ -117,7 +117,10 @@ static gboolean do_shut_down_next_time = TRUE;
+ #elif defined(__arm__)
+ #define __NR_ioprio_set		314
+ #define __NR_ioprio_get		315
+-#else
++#elif defined(__aarch64__)
++#define __NR_ioprio_set		30
++#define __NR_ioprio_get		31
++#else
+ #error "Unsupported architecture!"
+ #endif
+ 
+-- 
+2.13.2
+
diff --git a/maemo/hildon-thumbnail/APKBUILD b/maemo/hildon-thumbnail/APKBUILD
new file mode 100644
index 000000000..e75cb8ea7
--- /dev/null
+++ b/maemo/hildon-thumbnail/APKBUILD
@@ -0,0 +1,29 @@
+pkgname=hildon-thumbnail
+pkgver=3.0.51
+pkgrel=1
+pkgdesc="The Hildon Thumbnailer daemon"
+arch="all"
+url="https://github.com/maemo-leste/$pkgname"
+license="GPL"
+depends="libhildon"
+makedepends="libhildon-dev libosso-dev sqlite-dev libpng-dev libexif-dev libjpeg-turbo-dev gstreamer0.10-dev autoconf automake libtool"
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/$pkgname/archive/$pkgver.tar.gz
+	0001-add-__NR_ioprio_set-for-aarch64-to-fix-compilation.patch"
+subpackages="$pkgname-dev"
+
+builddir="$srcdir/$pkgname-$pkgver"
+
+build() {
+	cd "$builddir"
+	./autogen.sh
+	./configure --prefix=/usr --sysconfdir=/etc
+	# Compilation fails with multiple threads
+	make -j1
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir/" -j1 install
+}
+sha512sums="d0fa7ad86460db4d08686783590c303884c1d114ed8bdc227aa5684ea962b2f883d68ecc7707b6c598c540962814d1aeb312926e5bc94ada6fddc95b3e01aba0  hildon-thumbnail-3.0.51.tar.gz
+21c7075e5f5fecc30c1b53071ebc5d7f03d15714209a79c3e9f2db39613afaf578a734b1911f5692bdc811d924ab561c08e9cfde97eb75e1753fbcd9c7e76348  0001-add-__NR_ioprio_set-for-aarch64-to-fix-compilation.patch"
diff --git a/maemo/iphbd/APKBUILD b/maemo/iphbd/APKBUILD
index 8a670d9c2..aa2c6b197 100644
--- a/maemo/iphbd/APKBUILD
+++ b/maemo/iphbd/APKBUILD
@@ -1,27 +1,26 @@
 pkgname=iphbd
-pkgver=0.0.17
-pkgrel=1
-_rev=17b3aadb542ef144969450a4939251ec78c82a7d
+pkgver=0.0.18
+pkgrel=2
 pkgdesc="IP heartbeat daemon"
 arch="all"
-url="https://github.com/fremantle-gtk2/iphbd"
+url="https://github.com/maemo-leste/iphbd"
 license="GPL2"
 depends="dbus dbus-glib"
 makedepends="autoconf automake libtool dbus-glib-dev"
 subpackages="$pkgname-dev"
-source="$pkgname-$_rev.tar.gz::https://github.com/fremantle-gtk2/iphbd/archive/$_rev.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/iphbd/archive/$pkgver.tar.gz"
 
-builddir="$srcdir/iphbd-$_rev"
+builddir="$srcdir/iphbd-$pkgver"
 
 build() {
 	cd "$builddir"
-    ./autogen.sh
-    ./configure --prefix=/usr
-    make
+	./autogen.sh
+	./configure --prefix=/usr
+	make
 }
 
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir/" install
 }
-sha512sums="2ee02896ee9c7c434e5065a19e482cc70eca933a63192943cd7ce8b2cdb8ed1c1291a22b2bbd69e42864f9d4cc011b97083c3b14d0ab750ba7794002c1675f08  iphbd-17b3aadb542ef144969450a4939251ec78c82a7d.tar.gz"
+sha512sums="ddf500be33892ec275444747da003bc5fea7bc2f4969bb7fde5626e5c0988d21362753eb02f256736f7aeadf09ded20fa211a7f91cd142259e34beb4b1a4540b  iphbd-0.0.18.tar.gz"
diff --git a/maemo/libdsme/APKBUILD b/maemo/libdsme/APKBUILD
index 38baaef58..0471d835e 100644
--- a/maemo/libdsme/APKBUILD
+++ b/maemo/libdsme/APKBUILD
@@ -1,18 +1,17 @@
 pkgname=libdsme
 pkgver=0.60.30
-pkgrel=1
+pkgrel=2
 pkgdesc="Libraries for programs that communicate with the Device State Management Entity"
 arch="all"
-url="https://github.com/fremantle-gtk2/libdsme"
+url="https://github.com/maemo-leste/libdsme"
 license="GPL"
 depends="dbus glib"
 depends_dev="glib-dev"
 makedepends="bash glib-dev"
 subpackages="$pkgname-dev"
-_rev=3b90fe5a1c6be37ba507d036686649d687cb39ae
-source="$pkgname-$_rev.tar.gz::https://github.com/fremantle-gtk2/libdsme/archive/$_rev.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/libdsme/archive/$pkgver.tar.gz"
 
-_builddir="$srcdir/libdsme-$_rev"
+_builddir="$srcdir/libdsme-$pkgver"
 
 prepare() {
 	cd "$_builddir"
@@ -28,4 +27,4 @@ package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir/" install
 }
-sha512sums="ce3e6c8ef6543c317d7c5713b6f37b726b757de5e698757a26e308867d102c93a46c5a3900635ab2bff6e72b0ad884195b92d7aa53ec01263861afc876907eb2  libdsme-3b90fe5a1c6be37ba507d036686649d687cb39ae.tar.gz"
+sha512sums="4c8559b0267b03199deffcf7037bb76ba80d6143f01fb291052740e53e7fcf20bbdc700a65a40682a4fd346f33f14bd8628981ef260d27b63c83bd14b8b64624  libdsme-0.60.30.tar.gz"
diff --git a/maemo/libhildon/APKBUILD b/maemo/libhildon/APKBUILD
index e811a1fb2..7bd294b10 100644
--- a/maemo/libhildon/APKBUILD
+++ b/maemo/libhildon/APKBUILD
@@ -1,24 +1,23 @@
 pkgname=libhildon
 pkgver=2.2.25
-pkgrel=1
+pkgrel=2
 pkgdesc="Hildon libraries"
 arch="all"
-url="https://github.com/fremantle-gtk2/hildon"
+url="https://github.com/maemo-leste/hildon"
 license="GPL"
 depends="gtk+2.0-maemo gconf libcanberra maemo-l10n pango"
 depends_dev="gtk+2.0-maemo-dev libcanberra-dev gconf-dev"
 makedepends="autoconf automake libtool gtk-doc $depends_dev"
-_rev=954ebe8abe02e0b0e72db328ca1fed6a505be158
 subpackages="$pkgname-dev"
-source="$pkgname-$_rev.tar.gz::https://github.com/fremantle-gtk2/hildon/archive/$_rev.tar.gz
-    hildon-non-glibc.patch"
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/hildon/archive/$pkgver.tar.gz
+	hildon-non-glibc.patch"
 
-builddir="$srcdir/hildon-$_rev"
+builddir="$srcdir/hildon-$pkgver"
 
 build() {
 	cd "$builddir"
-    ./autogen.sh --prefix=/usr
-    make
+	./autogen.sh --prefix=/usr
+	make
 }
 
 package() {
@@ -27,5 +26,5 @@ package() {
 	# Prevent conflict with maemo-l10n
 	rm -rf "$pkgdir/usr/share/locale"
 }
-sha512sums="02a1f96b10c0547d96dab73d53c657803ea70a378a9fbdb93f30840180bbdc81c3320a3f6e24892da9a6acf5eda16eb6042d0758dfc921271e567bc0a66af82f  libhildon-954ebe8abe02e0b0e72db328ca1fed6a505be158.tar.gz
+sha512sums="e0b73d19c0406d19a2c6ad10a19e062310213dae2ecbbdf5831c063926d4b3e5998827b43599000185a9705629680afe4dcd40720029e14decd0813633f2acf1  libhildon-2.2.25.tar.gz
 5cc6578d513794276ed46292de9ecb72400477ffafa560ebbef2028c214e1a7c8e371f5179941cbfcb1865d2fc2db71e4f50f81e95a5173f247ec4412e312d12  hildon-non-glibc.patch"
diff --git a/maemo/libhildondesktop/APKBUILD b/maemo/libhildondesktop/APKBUILD
index abb285b3f..16252692f 100644
--- a/maemo/libhildondesktop/APKBUILD
+++ b/maemo/libhildondesktop/APKBUILD
@@ -1,17 +1,16 @@
 pkgname=libhildondesktop
 pkgver=2.1.43
-pkgrel=2
-_rev=813b16391359cccb1f100338dbb1530831e58784
+pkgrel=3
 pkgdesc="Hildon Desktop library"
 arch="all"
-url="https://github.com/fremantle-gtk2/libhildondesktop"
+url="https://github.com/maemo-leste/libhildondesktop"
 license="GPL"
 depends="libhildon iphbd dbus-glib"
 makedepends="autoconf automake libhildon-dev iphbd-dev dbus-glib-dev"
-subpackages="$pkgname-dev"
-source="$pkgname-$_rev.tar.gz::https://github.com/fremantle-gtk2/libhildondesktop/archive/$_rev.tar.gz"
+subpackages="$pkgname-dev $pkgname-examples"
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/libhildondesktop/archive/$pkgver.tar.gz"
 
-builddir="$srcdir/libhildondesktop-$_rev"
+builddir="$srcdir/libhildondesktop-$pkgver"
 
 build() {
 	cd "$builddir"
@@ -23,4 +22,12 @@ package() {
 	cd "$builddir"
     make DESTDIR="$pkgdir/" install
 }
-sha512sums="e6eb19fada805e3f5e19833f9d4f46d6677a9337287dd15bc0f186d70858cdfcb3e2b6713d18bbc54f61f8dc607f89dad13bcb17168918a16a23b149a0d35b3c  libhildondesktop-813b16391359cccb1f100338dbb1530831e58784.tar.gz"
+
+examples() {
+	pkgdesc="Hildon Desktop examples"
+	mkdir -p "$subpkgdir/usr/lib"
+	mv "$pkgdir/usr/lib/hildon-desktop" "$subpkgdir/usr/lib/"
+	mv "$pkgdir/usr/share" "$subpkgdir/usr/"
+}
+
+sha512sums="5766cfc600a2711ecb88d55a67a95e92555608b54217d8d83b8191e9c1d14ea0c3150e5c7ac2251acf83d7e200e80bfcd877c66a993e509c353b76da1136450f  libhildondesktop-2.1.43.tar.gz"
diff --git a/maemo/libhildonfm/APKBUILD b/maemo/libhildonfm/APKBUILD
new file mode 100644
index 000000000..3761bf418
--- /dev/null
+++ b/maemo/libhildonfm/APKBUILD
@@ -0,0 +1,27 @@
+pkgname=libhildonfm
+pkgver=2.28.22
+pkgrel=1
+pkgdesc="Hildon file management libraries"
+arch="all"
+url="https://github.com/maemo-leste/$pkgname"
+license="GPL"
+depends="libhildon"
+makedepends="gconf-dev gtk-doc mce-headers libhildon-dev libpng-dev libosso-dev
+	hildon-thumbnail-dev libhildonmime-dev
+	autoconf automake m4"
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/$pkgname/archive/$pkgver.tar.gz"
+subpackages="$pkgname-dev"
+
+builddir="$srcdir/$pkgname-$pkgver"
+
+build() {
+	cd "$builddir"
+	./autogen.sh --prefix=/usr
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir/" install
+}
+sha512sums="7462e3ded3a28eac811591665c7e345f77cb91ce26e65293a2810b74b9fa355b4346ab6947c25fe228556e1283fe1da5e281c87b6ba63fd22b1dd4e2327eee15  libhildonfm-2.28.22.tar.gz"
diff --git a/maemo/libhildonmime/APKBUILD b/maemo/libhildonmime/APKBUILD
new file mode 100644
index 000000000..4d8332958
--- /dev/null
+++ b/maemo/libhildonmime/APKBUILD
@@ -0,0 +1,25 @@
+pkgname=libhildonmime
+pkgver=3.0.0
+pkgrel=1
+pkgdesc="Hildon MIME library"
+arch="all"
+url="https://github.com/maemo-leste/$pkgname"
+license="GPL"
+depends=
+makedepends="glib-dev dbus-glib-dev gtk-doc libxml2-dev libtool automake autoconf m4"
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/$pkgname/archive/$pkgver.tar.gz"
+subpackages="$pkgname-dev"
+
+builddir="$srcdir/$pkgname-$pkgver"
+
+build() {
+	cd "$builddir"
+	./autogen.sh --prefix=/usr CFLAGS="${CFLAGS} -Wno-error=unused-but-set-variable"
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir/" install
+}
+sha512sums="cbd8425a039531e2246880a725d1c913af654a89ce60b23afdee1c5aae30f1a17f764db4ba8f3fbc9a91d8f0b528f5d3961a9efd0d2a7cea80142fd81b03eee0  libhildonmime-3.0.0.tar.gz"
diff --git a/maemo/libmatchbox2/APKBUILD b/maemo/libmatchbox2/APKBUILD
index 6ec48fb03..9a458229c 100644
--- a/maemo/libmatchbox2/APKBUILD
+++ b/maemo/libmatchbox2/APKBUILD
@@ -1,35 +1,34 @@
 pkgname=libmatchbox2
 pkgver=0.2.92
-pkgrel=1
-_rev=e9c043acdd7a1659dc7fec003123548f309726ce
+pkgrel=2
 pkgdesc="Library for Matchbox Project applications"
 arch="all"
-url="https://github.com/fremantle-gtk2/libmatchbox2"
+url="https://github.com/maemo-leste/libmatchbox2"
 license="GPL"
 depends="gtk+2.0-maemo pango libpng libxext clutter"
 depends_dev="libxcomposite-dev libxext-dev libxdamage-dev"
 makedepends="autoconf automake libtool
-    gtk+2.0-maemo-dev pango-dev clutter-dev libpng-dev $depends_dev"
+	gtk+2.0-maemo-dev pango-dev clutter-dev libpng-dev $depends_dev"
 subpackages="$pkgname-dev"
-source="$pkgname-$_rev.tar.gz::https://github.com/fremantle-gtk2/libmatchbox2/archive/$_rev.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/libmatchbox2/archive/$pkgver.tar.gz"
 
-builddir="$srcdir/libmatchbox2-$_rev"
+builddir="$srcdir/libmatchbox2-$pkgver"
 
 prepare() {
-    cd "$builddir"
-    sed -i -e 's/libpng12/libpng/g' configure.ac
-    sed -i -e 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/g' matchbox/theme-engines/mb-wm-theme-png.c
+	cd "$builddir"
+	sed -i -e 's/libpng12/libpng/g' configure.ac
+	sed -i -e 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/g' matchbox/theme-engines/mb-wm-theme-png.c
 }
 
 build() {
-    cd "$builddir"
-    autoreconf -i -f
-    ./configure --prefix=/usr --enable-png-theme --with-pango CFLAGS="${CFLAGS} -Wno-error=unused-result -Wno-error=deprecated-declarations"
-    make
+	cd "$builddir"
+	autoreconf -i -f
+	./configure --prefix=/usr --enable-png-theme --with-pango CFLAGS="${CFLAGS} -Wno-error=unused-result -Wno-error=deprecated-declarations"
+	make
 }
 
 package() {
-    cd "$builddir"
-    make DESTDIR="$pkgdir/" install
+	cd "$builddir"
+	make DESTDIR="$pkgdir/" install
 }
-sha512sums="eb3710ec32acdf8bfdf96605b711243d50ff4cbee856599dda7855b26109593476cac92218f4396c8beb247b72421bffe7a8ab7372f8070a899e6c03920b61a9  libmatchbox2-e9c043acdd7a1659dc7fec003123548f309726ce.tar.gz"
+sha512sums="67abf8db2c1a301a5b3cd81debb306a475066b6de888c5280bb427cbbd689b84d65136f2b49e3f49d3039625f2f5ff55d420e7595f460a433d57298c610862fe  libmatchbox2-0.2.92.tar.gz"
diff --git a/maemo/libosso/APKBUILD b/maemo/libosso/APKBUILD
new file mode 100644
index 000000000..03c16c5ba
--- /dev/null
+++ b/maemo/libosso/APKBUILD
@@ -0,0 +1,28 @@
+pkgname=libosso
+pkgver=2.32
+pkgrel=1
+pkgdesc="Basic library for Maemo applications"
+arch="all"
+url="https://github.com/maemo-leste/$pkgname"
+license="LGPL-2.1"
+depends="dbus-glib"
+makedepends="mce-headers autoconf automake libtool dbus-glib-dev linux-headers"
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/$pkgname/archive/$pkgver.tar.gz
+    libosso-mem-musl.patch"
+subpackages="$pkgname-dev"
+
+builddir="$srcdir/$pkgname-$pkgver"
+
+build() {
+	cd "$builddir"
+	./autogen.sh
+	./configure --prefix=/usr --sysconfdir=/etc --enable-stderr-logging
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir/" install
+}
+sha512sums="bebce3550fc9bcf925c5c507d7982f68154d5d196576c2d9600e01fa2c8f1ecc84ed72c35e3f31e8262207b637d9ffe7ddf6568278c977dffbd11212d6da4e9a  libosso-2.32.tar.gz
+cc4ea4ec285169ea848a8d2ca3c1a084b019c2ed93a39e2225389fffe893c0c5951ded49d4de4b13cf7d0e8fce884830b85d7382411a2973f132af8038106887  libosso-mem-musl.patch"
diff --git a/maemo/libosso/libosso-mem-musl.patch b/maemo/libosso/libosso-mem-musl.patch
new file mode 100644
index 000000000..7bfb1245d
--- /dev/null
+++ b/maemo/libosso/libosso-mem-musl.patch
@@ -0,0 +1,52 @@
+diff --git a/src/osso-mem.c b/src/osso-mem.c
+index 17fd5e2..0c74e3e 100644
+--- a/src/osso-mem.c
++++ b/src/osso-mem.c
+@@ -287,6 +287,7 @@ static void setup_sys_values(void)
+ } /* setup_sys_values */
+ 
+ 
++#if defined(__GLIBC__)
+ /* ------------------------------------------------------------------------- *
+  * saw_malloc_hook - Malloc hook. Executed when osso_mem_saw_active is in
+  * place. Thread-safe (= slow in some cases).
+@@ -337,7 +338,7 @@ static void* saw_malloc_hook(size_t size, const void* caller)
+ 
+    return ptr;
+ } /* saw_malloc_hook */
+-
++#endif
+ 
+ /* ========================================================================= *
+  * Public methods.
+@@ -583,6 +584,7 @@ int osso_mem_saw_enable(size_t threshold,
+    /* If we're below the threshold, don't make things worse */
+    if(threshold > 0 && available > threshold)
+    {
++#if defined(__GLIBC__)
+       const struct mallinfo mi = mallinfo();
+ 
+       THREAD_LOCK();
+@@ -602,6 +604,7 @@ int osso_mem_saw_enable(size_t threshold,
+ 
+       ULOG_INFO_F("SAW hook installed: block size %u, maxheap %u (threshold %u)",
+                   saw_max_block_size, saw_max_heap_size, threshold);
++#endif
+ 
+       return 0;
+    }
+@@ -621,12 +624,14 @@ int osso_mem_saw_enable(size_t threshold,
+  * ------------------------------------------------------------------------- */
+ void osso_mem_saw_disable(void)
+ {
++#if defined(__GLIBC__)
+    THREAD_LOCK();
+    if(saw_malloc_hook == __malloc_hook)
+       __malloc_hook = saw_old_malloc_hook;
+    THREAD_UNLOCK();
+ 
+    ULOG_INFO_F("SAW hook removed!");
++#endif
+ } /* osso_mem_saw_disable */
+ 
+ 
diff --git a/maemo/maemo-l10n/APKBUILD b/maemo/maemo-l10n/APKBUILD
index 19d97be7d..fb990d111 100644
--- a/maemo/maemo-l10n/APKBUILD
+++ b/maemo/maemo-l10n/APKBUILD
@@ -3,7 +3,7 @@ pkgver=210
 pkgrel=2
 pkgdesc="Localization files for Maemo applications"
 arch="noarch"
-url="https://github.com/fremantle-gtk2"
+url="https://github.com/maemo-leste"
 license="GPL"
 _url="https://coderus.openrepos.net/n900mirror/downloads.maemo.nokia.com/fremantle/ssu/mr0/"
 subpackages="$pkgname-doc"
diff --git a/maemo/maemo-launcher/APKBUILD b/maemo/maemo-launcher/APKBUILD
new file mode 100644
index 000000000..bf2605079
--- /dev/null
+++ b/maemo/maemo-launcher/APKBUILD
@@ -0,0 +1,26 @@
+pkgname=maemo-launcher
+pkgver=0.35
+pkgrel=1
+pkgdesc="Application startup accelerator for Maemo"
+arch="all"
+url="https://github.com/maemo-leste/$pkgname"
+license="GPL"
+depends="libhildon iphbd dbus-glib"
+makedepends="libhildon-dev iphbd-dev dbus-glib-dev autoconf automake m4"
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/$pkgname/archive/$pkgver.tar.gz"
+subpackages="$pkgname-dev $pkgname-doc"
+
+builddir="$srcdir/$pkgname-$pkgver"
+
+build() {
+	cd "$builddir"
+	autoreconf -i -f
+	./configure --prefix=/usr
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir/" install
+}
+sha512sums="8ec24811973c13099589f53a41fa7feef7672b0106513db7230794bfe94be76c235c9ed523a0ef9004e5b71683538c43522ba75acb6a08014795ce62b3f89ef0  maemo-launcher-0.35.tar.gz"
diff --git a/maemo/mce-headers/APKBUILD b/maemo/mce-headers/APKBUILD
index c31041fcb..0bf3307e2 100644
--- a/maemo/mce-headers/APKBUILD
+++ b/maemo/mce-headers/APKBUILD
@@ -1,26 +1,25 @@
 pkgname=mce-headers
 pkgver=1.8.19
-pkgrel=1
+pkgrel=2
 pkgdesc="Development files for mce"
 arch="noarch"
-url="https://github.com/fremantle-gtk2/mce-dev"
+url="https://github.com/maemo-leste/mce-dev"
 license="LGPL-2.1"
 makedepends="coreutils doxygen"
 subpackages="$pkgname-doc"
-_rev=4a1896a43d176b32ec2ea1248128be4f2ad720d0
-source="$pkgname-$_rev.tar.gz::https://github.com/fremantle-gtk2/mce-dev/archive/$_rev.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/mce-dev/archive/$pkgver.tar.gz"
 
-builddir="$srcdir/mce-dev-$_rev"
+builddir="$srcdir/mce-dev-$pkgver"
 
 build() {
-    cd "$builddir"
-    mkdir doc
+	cd "$builddir"
+	mkdir doc
 }
 
 package() {
-    cd "$builddir"
-    make DESTDIR="$pkgdir/" install
-    install -d $pkgdir/usr/share/doc/mce-doc/html/
-    install -m 644 doc/html/* $pkgdir/usr/share/doc/mce-doc/html/
+	cd "$builddir"
+	make DESTDIR="$pkgdir/" install
+	install -d $pkgdir/usr/share/doc/mce-doc/html/
+	install -m 644 doc/html/* $pkgdir/usr/share/doc/mce-doc/html/
 }
-sha512sums="5413c2dd407d2f90a791c6b423a90673b4aff6a2c8a4e7f7f7b3a3ab37f7a95003c10d1a215343a6d697b31766dc81eeba44a2bd32df7f03ced9bb9aa0918852  mce-headers-4a1896a43d176b32ec2ea1248128be4f2ad720d0.tar.gz"
+sha512sums="e7eafc081ce1702b8eb42951abea58e98b54bb313e7c742b0502e2d189ed5c71bb72b4ed344537e98c9a9aa6da90bf3cfd5933a302918dd5e18552f32933a9ae  mce-headers-1.8.19.tar.gz"
diff --git a/maemo/osso-bookmark-engine/APKBUILD b/maemo/osso-bookmark-engine/APKBUILD
new file mode 100644
index 000000000..5771c0a8c
--- /dev/null
+++ b/maemo/osso-bookmark-engine/APKBUILD
@@ -0,0 +1,24 @@
+pkgname=osso-bookmark-engine
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="Bookmark engine for the Maemo Bookmark application"
+arch="all"
+url="https://github.com/maemo-leste/$pkgname"
+license="GPL"
+depends=
+makedepends="gconf-dev glib-dev libtool libxml2-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/$pkgname/archive/$pkgver.tar.gz"
+subpackages="$pkgname-dev"
+
+builddir="$srcdir/$pkgname-$pkgver"
+
+build() {
+	cd "$builddir"
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir/" install
+}
+sha512sums="f19cfd615c7658c9da7ada8d53c398f7f6ec9bd6ac5c99f6bb85551ec9db9f7865507a00a877f32ebf15924d69c4f85d5d444443b817a27ca9da4bb176bab323  osso-bookmark-engine-2.0.0.tar.gz"
diff --git a/maemo/osso-xterm/APKBUILD b/maemo/osso-xterm/APKBUILD
new file mode 100644
index 000000000..a1e31eac1
--- /dev/null
+++ b/maemo/osso-xterm/APKBUILD
@@ -0,0 +1,27 @@
+pkgname=osso-xterm
+pkgver=0.14
+_tag=0.14.mh31
+pkgrel=0
+pkgdesc="Maemo X Terminal Emulator"
+arch="all"
+url="https://github.com/maemo-leste/$_tag"
+license="GPL"
+depends="maemo-launcher"
+makedepends="dbus-glib-dev gconf-dev vte-dev libhildon-dev maemo-launcher-dev
+	libosso-dev autoconf automake m4"
+source="$pkgname-$_tag.tar.gz::https://github.com/maemo-leste/$pkgname/archive/$_tag.tar.gz"
+
+builddir="$srcdir/$pkgname-$_tag"
+
+build() {
+	cd "$builddir"
+	./autogen.sh
+	./configure --prefix=/usr --enable-maemo-launcher
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir/" install
+}
+sha512sums="3ce3f33e48eee2c4de566e99b2e586fc2a7cc42d83d101e6707370b1a02f2926b6bd3f8f253771d999751a21b048f251c88ab87eb40b8905a02c844939e526a6  osso-xterm-0.14.mh31.tar.gz"
diff --git a/maemo/profiled/APKBUILD b/maemo/profiled/APKBUILD
index f0b239da8..c4c0f8016 100644
--- a/maemo/profiled/APKBUILD
+++ b/maemo/profiled/APKBUILD
@@ -1,18 +1,17 @@
 pkgname=profiled
-pkgver=1.0.4
-pkgrel=1
-_rev=77ca133bb1755f556a431b1338c342ffbafba700
+pkgver=1.0.6
+pkgrel=0
 pkgdesc="Maemo profile daemon, manages user settings"
 arch="all"
-url="https://github.com/fremantle-gtk2/profiled"
+url="https://github.com/maemo-leste/profiled"
 license="BSD"
 depends="dbus dbus-glib"
 makedepends="doxygen dbus-dev dbus-glib-dev"
 subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-$_rev.tar.gz::https://github.com/fremantle-gtk2/profiled/archive/$_rev.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/profiled/archive/$pkgver.tar.gz
 	profiled-fix-musl.patch"
 
-builddir="$srcdir/profiled-$_rev"
+builddir="$srcdir/profiled-$pkgver"
 
 build() {
 	cd "$builddir"
@@ -23,5 +22,5 @@ package() {
 	cd "$builddir"
 	make ROOT="$pkgdir/" install
 }
-sha512sums="42dd82dc5d6aa825698fd425ecf3fc5eab11aa9d89e03d576179e321be39f2a0041775f3270e9cba5139ff87c7585aa519970404f787867bb59b2eb7c6da1a67  profiled-77ca133bb1755f556a431b1338c342ffbafba700.tar.gz
+sha512sums="b97959b1973c268f738fcfea5a265a80e9ca81057cba698b9a8584712ee74ff6b0d0025a696ddb14274ad6ec3be2035a9400cab64406c8769b55ec47fc8ee101  profiled-1.0.6.tar.gz
 21d0bd943c165de35223fc7003da8438eb77f7450810ce0a4ba8d0ae918c3af36f286503d568fe97e534e9a52463cd657b00277cc7ff010869e43453b6142328  profiled-fix-musl.patch"
diff --git a/maemo/sapwood/APKBUILD b/maemo/sapwood/APKBUILD
new file mode 100644
index 000000000..2f715e510
--- /dev/null
+++ b/maemo/sapwood/APKBUILD
@@ -0,0 +1,24 @@
+pkgname=sapwood
+pkgver=3.1.1
+pkgrel=1
+pkgdesc="Maemo pixbuf-based theme for GTK+ 2.x"
+arch="all"
+url="https://github.com/maemo-leste/$pkgname"
+license="GPL"
+depends="gtk+2.0-maemo"
+makedepends="gtk+2.0-maemo-dev autoconf automake m4 libtool"
+source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/$pkgname/archive/$pkgver.tar.gz"
+
+builddir="$srcdir/$pkgname-$pkgver"
+
+build() {
+	cd "$builddir"
+	./autogen.sh --prefix=/usr --enable-abstract-sockets
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir/" install
+}
+sha512sums="6d0d0320b6b73e5ba3f3d1950e6cc542bb0f5195e7738661c0b815b63234057a06bb1757a046a71a49fd044fd5ba8c8c423b20af480f70d19d84e3ca25885f82  sapwood-3.1.1.tar.gz"