diff --git a/haiku-apps/befar/befar-4.2_beta.recipe b/haiku-apps/befar/befar-4.2_beta.recipe
index 9119eb1ee..28f4630cf 100644
--- a/haiku-apps/befar/befar-4.2_beta.recipe
+++ b/haiku-apps/befar/befar-4.2_beta.recipe
@@ -4,11 +4,14 @@ inside."
 HOMEPAGE="https://github.com/HaikuArchives/BeFar"
 COPYRIGHT="1999-2001 Bazarov Max"
 LICENSE="Public Domain"
-REVISION="3"
-SOURCE_URI="$HOMEPAGE/archive/2897e9658ca5f275c4b85d25f894390b9007828c.tar.gz"
-SOURCE_DIR="$portVersionedName/source"
+REVISION="4"
+srcGitRev="2897e9658ca5f275c4b85d25f894390b9007828c"
+SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="73623665669c324186e5810d2709dee59854d0a314faff19b818c66bbdd6317a"
+SOURCE_DIR="BeFAR-$srcGitRev/source"
+PATCHES="befar-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 x86 !x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	befar = $portVersion
diff --git a/haiku-apps/befar/patches/befar-4.2_beta.patchset b/haiku-apps/befar/patches/befar-4.2_beta.patchset
new file mode 100644
index 000000000..2a5fd7d97
--- /dev/null
+++ b/haiku-apps/befar/patches/befar-4.2_beta.patchset
@@ -0,0 +1,35 @@
+From 2c001f1a815125630b49d65e9c54b2c3d6aa643c Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 24 Jan 2017 20:54:31 +0100
+Subject: x86_64 build fix
+
+
+diff --git a/BF_GUI/BF_GUI_Edit.cpp b/BF_GUI/BF_GUI_Edit.cpp
+index efc2e8e..7483f35 100644
+--- a/BF_GUI/BF_GUI_Edit.cpp
++++ b/BF_GUI/BF_GUI_Edit.cpp
+@@ -61,7 +61,7 @@ BF_GUI_ViewEdit::MessageReceived(BMessage* po_Message)
+ 		if(!be_clipboard->Lock()) return;
+ 		BMessage 	*po = be_clipboard->Data();
+ 		const char	*pcData=NULL;
+-		int32		iTextLen;		
++		ssize_t		iTextLen;
+ 		if(!po || B_OK!=po->FindData("text/plain",B_MIME_TYPE,(const void**)&pcData,&iTextLen) || !pcData) return;
+ 		if(iTextLen<=0) return;
+ 		
+diff --git a/FilesPanel/BF_GUI_FilesPanel.cpp b/FilesPanel/BF_GUI_FilesPanel.cpp
+index 871261a..79fa6cf 100644
+--- a/FilesPanel/BF_GUI_FilesPanel.cpp
++++ b/FilesPanel/BF_GUI_FilesPanel.cpp
+@@ -871,7 +871,7 @@ BF_GUI_FilesPanel::Action_PasteFromBuffer()
+ 		BMessage *po = be_clipboard->Data();				
+ 		
+ 		const char *pcText;
+-		int32 iTextLen=0;;		
++		ssize_t iTextLen=0;
+ 		status_t uRes = po->FindData("text/plain", B_MIME_TYPE,(const void **)&pcText, &iTextLen);
+ 		be_clipboard->Commit();
+ 		be_clipboard->Unlock();
+-- 
+2.10.2
+