diff --git a/common/shlibs b/common/shlibs
index 14199c7ad5f..a705e1b3c6a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -865,7 +865,7 @@ libtracker-miner-1.0.so.0 libtracker-1.0.0_1
 libtracker-sparql-1.0.so.0 libtracker-1.0.0_1
 libtracker-control-1.0.so.0 libtracker-1.0.0_1
 libfm.so.4 libfm-1.2.3_3
-libfm-gtk.so.4 libfm-1.2.3_3
+libfm-gtk.so.4 libfm-gtk-1.2.4_2
 libfm-extra.so.4 libfm-extra-1.2.3_3
 libunique-1.0.so.0 libunique1-1.1.6_1
 libxnoise.so.0 libxnoise-0.1.29_1
diff --git a/srcpkgs/libfm-gtk b/srcpkgs/libfm-gtk
new file mode 120000
index 00000000000..c9929577f8a
--- /dev/null
+++ b/srcpkgs/libfm-gtk
@@ -0,0 +1 @@
+libfm
\ No newline at end of file
diff --git a/srcpkgs/libfm-gtk-devel b/srcpkgs/libfm-gtk-devel
new file mode 120000
index 00000000000..c9929577f8a
--- /dev/null
+++ b/srcpkgs/libfm-gtk-devel
@@ -0,0 +1 @@
+libfm
\ No newline at end of file
diff --git a/srcpkgs/libfm/template b/srcpkgs/libfm/template
index 7b5f79f2ff7..bf1f3f655d5 100644
--- a/srcpkgs/libfm/template
+++ b/srcpkgs/libfm/template
@@ -4,14 +4,14 @@
 #
 pkgname=libfm
 version=1.2.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-udisks --disable-static"
 hostmakedepends="automake glib-devel gtk-doc gettext-devel libtool pkg-config intltool vala-devel"
 makedepends="libexif-devel dbus-glib-devel gtk+-devel menu-cache-devel"
-depends="libfm-extra>=${version}_${revision} desktop-file-utils"
+depends="libfm-extra>=${version}"
 conf_files="/etc/xdg/libfm/libfm.conf"
-short_desc="LXDE GLib/GIO based library"
+short_desc="Core library of PCManFM file manager"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://pcmanfm.sourceforge.net/"
 license="GPL-2"
@@ -21,20 +21,44 @@ checksum=7804f6f28cb3d1bc8ffb3151ab7ff0c063b27c5f9b06c682eb903e01cf25502f
 pre_configure() {
 	autoreconf -fi
 }
-
 post_install() {
 	# remove files that belong to libfm-extra
 	rm -f ${DESTDIR}/usr/lib/libfm-extra.so*
 	rm -f ${DESTDIR}/usr/lib/pkgconfig/libfm-extra.pc
 	rm -f ${DESTDIR}/usr/include/libfm/fm-{extra,version,xml-file}.h
+	# move locales to /usr/share/locale (needed for musl libc)
+	if [ -d ${DESTDIR}/usr/lib/locale ]; then
+		mv ${DESTDIR}/usr/lib/locale ${DESTDIR}/usr/share
+	fi
 }
 
 libfm-devel_package() {
-	depends="gtk+-devel menu-cache-devel ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" -- development files"
+	depends="glib-devel menu-cache-devel ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig/libfm.pc
+		vmove usr/lib/libfm.so
+	}
+}
+libfm-gtk_package() {
+	short_desc+=" - GTK+ library"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/lib/libfm-gtk.so.*
+		vmove usr/lib/libfm/modules/gtk-*.so
+		vmove usr/share/applications
+		vmove usr/share/libfm/images
+		vmove usr/share/libfm/ui
+		vmove usr/share/man
+	}
+}
+libfm-gtk-devel_package() {
+	depends="gtk+-devel
+	 libfm-devel>=${version}_${revision} libfm-gtk>=${version}_${revision}"
+	short_desc+=" - GTK+ library (development files)"
+	pkg_install() {
+		vmove usr/lib/libfm-gtk.so
+		vmove usr/lib/pkgconfig/libfm-gtk.pc
 	}
 }