diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp-gtk/Makefile
index a76fa7878485..c3f921b1c922 100644
--- a/net-p2p/eiskaltdcpp-gtk/Makefile
+++ b/net-p2p/eiskaltdcpp-gtk/Makefile
@@ -1,56 +1,54 @@
 # Created by: Stas Timokhin <stast@bsdportal.ru>
 
 PORTNAME=	eiskaltdcpp
 PORTREVISION=	20
 CATEGORIES=	net-p2p
 PKGNAMESUFFIX=	-gtk
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	EiskaltDC++ client GTK graphic interface
 
 LICENSE=	GPLv3
 
-BROKEN=		Doesn't compile with Pango 1.46.2 or newer - PR 249879
-
 RUN_DEPENDS=	eiskaltdcpp-data>=0:net-p2p/eiskaltdcpp-data
 LIB_DEPENDS=	libeiskaltdcpp.so:net-p2p/eiskaltdcpp-lib
 
 MASTERDIR=	${.CURDIR}/../eiskaltdcpp-lib
 
 USES=		cmake compiler:c++11-lib desktop-file-utils gettext gnome ssl
 USE_GNOME=	pango glib20
 
 OPTIONS_DEFINE=	LIBNOTIFY FREE_SPACE
 OPTIONS_DEFAULT=	LIBNOTIFY FREE_SPACE GTK2 NOSOUND
 OPTIONS_SINGLE=	GTK SOUND
 OPTIONS_SINGLE_GTK=	GTK2 GTK3
 OPTIONS_SINGLE_SOUND=	NOSOUND LIBCANBERRA
 NOSOUND_DESC=	Disable sound notification support
 LIBCANBERRA_DESC=	Sound notification support via libcanberra
 LIBNOTIFY_DESC=	Popup notification support
 FREE_SPACE_DESC=Free space bar in status panel
 GTK_DESC=	GTK GUI toolkit version
 
 CMAKE_ARGS+=	-DUSE_QT:BOOL=OFF
 CMAKE_ARGS+=	-DCREATE_MO:BOOL=ON
 CMAKE_ARGS+=	-DINSTALL_DATA:BOOL=OFF
 
 NOSOUND_CMAKE_ON=	-DUSE_LIBGNOME2:BOOL=OFF -DUSE_LIBCANBERRA:BOOL=OFF
 
 LIBCANBERRA_LIB_DEPENDS=libcanberra-gtk.so:audio/libcanberra
 LIBCANBERRA_CMAKE_ON=	-DUSE_LIBGNOME2:BOOL=OFF -DUSE_LIBCANBERRA:BOOL=ON
 
 LIBNOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 LIBNOTIFY_CMAKE_BOOL=	USE_LIBNOTIFY
 
 GTK2_USE=		gnome=gtk20
 GTK2_CMAKE_BOOL=	USE_GTK
 GTK2_CMAKE_BOOL_OFF=	USE_GTK3
 
 GTK3_USE=		gnome=gtk30
 GTK3_CMAKE_BOOL=	USE_GTK3
 GTK3_CMAKE_BOOL_OFF=	USE_GTK
 
 FREE_SPACE_CMAKE_BOOL=	FREE_SPACE_BAR_C
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-cmake_FindGTK2.cmake b/net-p2p/eiskaltdcpp-lib/files/patch-cmake_FindGTK2.cmake
new file mode 100644
index 000000000000..78059eb51549
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-cmake_FindGTK2.cmake
@@ -0,0 +1,20 @@
+--- cmake/FindGTK2.cmake.orig	2015-04-19 21:57:16 UTC
++++ cmake/FindGTK2.cmake
+@@ -167,6 +167,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
+         gtkmm-2.4
+         libglade-2.0
+         libglademm-2.4
++        harfbuzz
+         pango-1.0
+         pangomm-1.4
+         sigc++-2.0
+@@ -455,6 +456,9 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
+         _GTK2_FIND_LIBRARY    (GTK2_CAIRO_LIBRARY cairo false false)
+ 
+         _GTK2_FIND_INCLUDE_DIR(GTK2_FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h)
++
++        _GTK2_FIND_INCLUDE_DIR(GTK2_HARFBUZZ_INCLUDE_DIR hb.h)
++        _GTK2_FIND_LIBRARY    (GTK2_HARFBUZZ_LIBRARY harfbuzz false false)
+ 
+         _GTK2_FIND_INCLUDE_DIR(GTK2_PANGO_INCLUDE_DIR pango/pango.h)
+         _GTK2_FIND_LIBRARY    (GTK2_PANGO_LIBRARY pango false true)
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-cmake_FindGTK3.cmake b/net-p2p/eiskaltdcpp-lib/files/patch-cmake_FindGTK3.cmake
new file mode 100644
index 000000000000..ddce82b2bd2d
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-cmake_FindGTK3.cmake
@@ -0,0 +1,20 @@
+--- cmake/FindGTK3.cmake.orig	2015-04-19 21:57:16 UTC
++++ cmake/FindGTK3.cmake
+@@ -128,6 +128,7 @@ function(_GTK3_FIND_INCLUDE_DIR _var _hdr)
+         gtkmm-2.4
+         libglade-2.0
+         libglademm-2.4
++        harfbuzz
+         pango-1.0
+         pangomm-1.4
+         sigc++-2.2
+@@ -421,6 +422,9 @@ foreach(_GTK3_component ${GTK3_FIND_COMPONENTS})
+         _GTK3_FIND_LIBRARY    (GTK3_CAIRO_LIBRARY cairo false false)
+ 
+         _GTK3_FIND_INCLUDE_DIR(GTK3_FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h)
++
++        _GTK3_FIND_INCLUDE_DIR(GTK3_HARFBUZZ_INCLUDE_DIR hb.h)
++        _GTK3_FIND_LIBRARY    (GTK3_HARFBUZZ_LIBRARY harfbuzz false false)
+ 
+         _GTK3_FIND_INCLUDE_DIR(GTK3_PANGO_INCLUDE_DIR pango/pango.h)
+         _GTK3_FIND_LIBRARY    (GTK3_PANGO_LIBRARY pango false true)