diff --git a/common/shlibs b/common/shlibs
index 291096fd292..9ff1873fa06 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -62,7 +62,7 @@ libobjc.so.3 libobjc-4.4.0_1
 libmudflap.so.0 libmudflap-4.4.0_1
 libmudflapth.so.0 libmudflap-4.4.0_1
 libgomp.so.1 libgomp-4.4.0_1
-libmagic.so.1 file-4.90_1
+libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
diff --git a/srcpkgs/file/file-devel.template b/srcpkgs/file/file-devel.template
index 611d6bef4db..e220cf48798 100644
--- a/srcpkgs/file/file-devel.template
+++ b/srcpkgs/file/file-devel.template
@@ -1,16 +1,10 @@
 # Template file for 'file-devel'.
 #
-depends="zlib-devel file"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
+noarch=yes
+depends="zlib-devel libmagic>=${version}"
+short_desc="File type identification library -- development files"
 
- This package contains files for development, headers, static libs, etc."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/libmagic.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
+do_install() {
+	vmove usr/include usr
+	vmove usr/share/man/man3 usr/share/man
 }
diff --git a/srcpkgs/file/libmagic.template b/srcpkgs/file/libmagic.template
new file mode 100644
index 00000000000..7c18a268c29
--- /dev/null
+++ b/srcpkgs/file/libmagic.template
@@ -0,0 +1,10 @@
+# Template file for 'libmagic'.
+#
+short_desc="File type identification library"
+replaces="file<5.12"
+
+do_install() {
+	vmove usr/lib usr
+	vmove usr/share/misc usr/share
+	vmove usr/share/man/man4 usr/share/man
+}
diff --git a/srcpkgs/file/template b/srcpkgs/file/template
index 75a6a0f9bb0..64081d07afb 100644
--- a/srcpkgs/file/template
+++ b/srcpkgs/file/template
@@ -1,17 +1,13 @@
 # Template file for 'file'
 pkgname=file
-version=5.11
-distfiles="ftp://ftp.astron.com/pub/file/$pkgname-$version.tar.gz"
+version=5.12
+revision=1
+subpackages="libmagic file-devel"
 build_style=gnu-configure
 makedepends="zlib-devel"
-revision=1
 short_desc="File type identification utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.darwinsys.com/file/"
 license="BSD"
-checksum=c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7
-long_desc="
- File attempts to classify files depending on their contents and prints
- a description if a match is found."
-
-subpackages="file-devel"
+distfiles="ftp://ftp.astron.com/pub/file/file-${version}.tar.gz"
+checksum=199d0dab2e32814cbced8dc30d3d2d5b7e45587598160a2c401358b573273d22
diff --git a/srcpkgs/libmagic b/srcpkgs/libmagic
new file mode 120000
index 00000000000..1a010b1c0f0
--- /dev/null
+++ b/srcpkgs/libmagic
@@ -0,0 +1 @@
+file
\ No newline at end of file