diff --git a/U_use-recommended-freetype-include.patch b/U_use-recommended-freetype-include.patch
new file mode 100644
index 0000000..d1c372b
--- /dev/null
+++ b/U_use-recommended-freetype-include.patch
@@ -0,0 +1,29 @@
+From 4acfdaf95adb0a05c2a25550bdde036c865902f4 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Mon, 02 Dec 2013 15:26:24 +0000
+Subject: Use FT_*_H macros instead of including <freetype/*.h>
+
+freetype moved its headers around in 2.5.1.
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+diff --git a/src/xftglyphs.c b/src/xftglyphs.c
+index 2f3dc5a..4b5fb82 100644
+--- a/src/xftglyphs.c
++++ b/src/xftglyphs.c
+@@ -21,10 +21,10 @@
+  */
+ 
+ #include "xftint.h"
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftlcdfil.h>
++#include FT_OUTLINE_H
++#include FT_LCD_FILTER_H
+ 
+-#include <freetype/ftsynth.h>
++#include FT_SYNTHESIS_H
+ 
+ /*
+  * Validate the memory info for a font
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/libXft.changes b/libXft.changes
index 312065c..43ea23f 100644
--- a/libXft.changes
+++ b/libXft.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Dec 11 18:23:52 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Added U_use-recommended-freetype-include.patch -- Freetype upstream 
+  recommends using their macros together with ft2build include. 
+  Positive sideeffect is that this patch makes it build with both 
+  freetype2 2.5.1, and older version
+
 -------------------------------------------------------------------
 Sun Feb 17 17:21:53 UTC 2013 - jengelh@inai.de
 
diff --git a/libXft.spec b/libXft.spec
index e4b95ea..807013d 100644
--- a/libXft.spec
+++ b/libXft.spec
@@ -28,6 +28,9 @@ Url:            http://xorg.freedesktop.org/
 #Git-Clone:	git://anongit.freedesktop.org/xorg/lib/libXft
 #Git-Web:	http://cgit.freedesktop.org/xorg/lib/libXft/
 Source:         http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM U_use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with
+# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions
+Patch0:         U_use-recommended-freetype-include.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 BuildRequires:  autoconf >= 2.60
@@ -69,6 +72,7 @@ in %lname.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 autoreconf -fi