diff --git a/dev-libs/libfilezilla/libfilezilla-0.6.1.recipe b/dev-libs/libfilezilla/libfilezilla-0.6.1.recipe
new file mode 100644
index 000000000..6c4ffd9a3
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.6.1.recipe
@@ -0,0 +1,75 @@
+SUMMARY="C++ library for platform-independent programs"
+DESCRIPTION="Some of the highlights include:
+
+- A typesafe, multi-threaded event system that's very simple to use yet \
+extremely efficient
+- Timers for periodic events
+- A datetime class that not only tracks timestamp but also their accuracy, \
+which simplifies dealing with timestamps originating from different sources
+- Simple process handling for spawning child processes with redirected I/O"
+HOMEPAGE="https://lib.filezilla-project.org"
+COPYRIGHT="2015-2016 Tim Kosse"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://downloads.sf.net/filezilla/libfilezilla-$portVersion.tar.bz2"
+CHECKSUM_SHA256="73c3ada6f9c5649abd93e6a3e7ecc6682d4f43248660b5506918eab76a7b901b"
+PATCHES="libfilezilla-$portVersion.patchset"
+
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	libfilezilla$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libfilezilla$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libfilezilla${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libfilezilla$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	libfilezilla$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libiconv$secondaryArchSuffix
+	devel:libcppunit$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:doxygen
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	autoreconf -vfi
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm -f $libDir/libfilezilla.la
+
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make check
+}
diff --git a/dev-libs/libfilezilla/patches/libfilezilla-0.6.1.patchset b/dev-libs/libfilezilla/patches/libfilezilla-0.6.1.patchset
new file mode 100644
index 000000000..82dfd3170
--- /dev/null
+++ b/dev-libs/libfilezilla/patches/libfilezilla-0.6.1.patchset
@@ -0,0 +1,28 @@
+From 9303bdc9ed9ff4099946102eca8bbf10a22dea04 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Wed, 24 Aug 2016 20:59:54 +0200
+Subject: [PATCH] Haiku patch
+
+---
+ lib/time.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/lib/time.cpp b/lib/time.cpp
+index b434303..7400405 100644
+--- a/lib/time.cpp
++++ b/lib/time.cpp
+@@ -5,6 +5,11 @@
+ #include <sys/time.h>
+ #endif
+ 
++#ifdef __HAIKU__
++#  define timegm rpl_timegm
++time_t timegm (struct tm *__tm);
++# endif
++
+ #include <wchar.h>
+ 
+ //#include <cassert>
+-- 
+2.7.0
+