diff --git a/x11/libfm/Makefile.inc b/x11/libfm/Makefile.inc
index ae2298b9363..66f31ea8746 100644
--- a/x11/libfm/Makefile.inc
+++ b/x11/libfm/Makefile.inc
@@ -1,17 +1,20 @@
-# $OpenBSD: Makefile.inc,v 1.3 2016/04/27 13:27:00 ajacoutot Exp $
+# $OpenBSD: Makefile.inc,v 1.4 2017/01/26 01:40:28 ajacoutot Exp $
 
-V=			1.2.4
+V=			1.2.5
 DISTNAME=		libfm-${V}
 EXTRACT_SUFX=		.tar.xz
 
-SHARED_LIBS +=  fm                   1.0      # 4.4
-SHARED_LIBS +=  fm-gtk               1.0      # 4.4
-SHARED_LIBS +=  fm-extra             1.0      # 4.4
+# quantum entanglement between core and extra
+SHARED_LIBS +=  fm                   1.0      # 4.5
+SHARED_LIBS +=  fm-gtk               1.0      # 4.5
+SHARED_LIBS +=  fm-extra             1.0      # 4.5
 
 CATEGORIES +=		x11 devel
 
 HOMEPAGE=		http://pcmanfm.sourceforge.net/
 
+MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
+
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM=	Yes
 
@@ -25,4 +28,3 @@ CONFIGURE_ENV +=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 # prevent undefined references to libc functions
 CONFIGURE_ENV +=	ac_cv_ld_z_defs=no
-
diff --git a/x11/libfm/core/distinfo b/x11/libfm/core/distinfo
index c156f9a2a44..85049b03364 100644
--- a/x11/libfm/core/distinfo
+++ b/x11/libfm/core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libfm-1.2.4.tar.xz) = eAT28oyz0byP+zFRq3/wwGOyfF+bBsaC65A+Ac8lUC8=
-SIZE (libfm-1.2.4.tar.xz) = 912164
+SHA256 (libfm-1.2.5.tar.xz) = xwa7ECDPXy1vWpIm9pLOGYWUcTTc8r3mQni9BCB3m1o=
+SIZE (libfm-1.2.5.tar.xz) = 912740
diff --git a/x11/libfm/core/patches/patch-docs_reference_libfm_Makefile_in b/x11/libfm/core/patches/patch-docs_reference_libfm_Makefile_in
index a66cb94eff7..f4671113588 100644
--- a/x11/libfm/core/patches/patch-docs_reference_libfm_Makefile_in
+++ b/x11/libfm/core/patches/patch-docs_reference_libfm_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-docs_reference_libfm_Makefile_in,v 1.1 2015/06/24 06:52:15 ajacoutot Exp $
---- docs/reference/libfm/Makefile.in.orig	Tue Oct 14 18:46:20 2014
-+++ docs/reference/libfm/Makefile.in	Wed Jun 24 00:04:15 2015
-@@ -870,7 +870,6 @@ dist-hook: dist-check-gtkdoc dist-hook-local
+$OpenBSD: patch-docs_reference_libfm_Makefile_in,v 1.2 2017/01/26 01:40:28 ajacoutot Exp $
+--- docs/reference/libfm/Makefile.in.orig	Sat Dec 10 00:49:17 2016
++++ docs/reference/libfm/Makefile.in	Thu Jan 26 02:31:46 2017
+@@ -909,7 +909,6 @@ dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-loc
  # we don't have tests here
  test:
  
diff --git a/x11/libfm/extra/Makefile b/x11/libfm/extra/Makefile
index 35fe2b9a19f..f46a5f4cc7c 100644
--- a/x11/libfm/extra/Makefile
+++ b/x11/libfm/extra/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2016/04/27 13:27:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2017/01/26 01:40:28 ajacoutot Exp $
 
 COMMENT=		extra library for libfm
 
@@ -9,6 +9,6 @@ WANTLIB += iconv intl m pcre pthread z
 
 LIB_DEPENDS=		devel/glib2
 
-CONFIGURE_ARGS +=	--with-extra-only
+CONFIGURE_ARGS=		--with-extra-only
 
 .include <bsd.port.mk>
diff --git a/x11/libfm/extra/distinfo b/x11/libfm/extra/distinfo
index c156f9a2a44..85049b03364 100644
--- a/x11/libfm/extra/distinfo
+++ b/x11/libfm/extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libfm-1.2.4.tar.xz) = eAT28oyz0byP+zFRq3/wwGOyfF+bBsaC65A+Ac8lUC8=
-SIZE (libfm-1.2.4.tar.xz) = 912164
+SHA256 (libfm-1.2.5.tar.xz) = xwa7ECDPXy1vWpIm9pLOGYWUcTTc8r3mQni9BCB3m1o=
+SIZE (libfm-1.2.5.tar.xz) = 912740
diff --git a/x11/libfm/patches/patch-docs_reference_libfm_Makefile_in b/x11/libfm/patches/patch-docs_reference_libfm_Makefile_in
deleted file mode 100644
index a1a31a621fe..00000000000
--- a/x11/libfm/patches/patch-docs_reference_libfm_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-docs_reference_libfm_Makefile_in,v 1.2 2015/06/23 22:33:35 ajacoutot Exp $
---- docs/reference/libfm/Makefile.in.orig	Tue Oct 14 18:46:20 2014
-+++ docs/reference/libfm/Makefile.in	Wed Jun 24 00:04:15 2015
-@@ -870,7 +870,6 @@ dist-hook: dist-check-gtkdoc dist-hook-local
- # we don't have tests here
- test:
- 
---include $(top_srcdir)/git.mk
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.