diff --git a/0001-mesa_dri2-Add-missing-include-of-config.h-to-define-.patch b/0001-mesa_dri2-Add-missing-include-of-config.h-to-define-.patch
new file mode 100644
index 0000000..5598410
--- /dev/null
+++ b/0001-mesa_dri2-Add-missing-include-of-config.h-to-define-.patch
@@ -0,0 +1,31 @@
+From 1cda354bdfd0c9ca107293b84b52f4464fdbedcc Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 1 Sep 2015 10:45:11 +0200
+Subject: [PATCH 1/3] mesa_dri2: Add missing include of config.h to define _GNU_SOURCE
+
+Fix build with -Wimplicit-function-declaration while secure_getenv() is
+guarded by __USE_GNU.
+
+Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
+Tested-by: Stefan Dirsch <sndirsch@suse.de>
+---
+ src/mesa_dri2.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/mesa_dri2.c b/src/mesa_dri2.c
+index 51e8794..420ccee 100644
+--- a/src/mesa_dri2.c
++++ b/src/mesa_dri2.c
+@@ -33,6 +33,9 @@
+  *   and José Hiram Soltren (jsoltren@nvidia.com)
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ 
+ #define NEED_REPLIES
+ #include <X11/Xlibint.h>
+-- 
+1.7.2.1
+
diff --git a/0002-util.h-Make-getenv_wrapper-static-inline.patch b/0002-util.h-Make-getenv_wrapper-static-inline.patch
new file mode 100644
index 0000000..63a0648
--- /dev/null
+++ b/0002-util.h-Make-getenv_wrapper-static-inline.patch
@@ -0,0 +1,31 @@
+From fb5362be7a6d6f89f76c5e171c339f5fa1916d38 Mon Sep 17 00:00:00 2001
+From: Aaron Plattner <aplattner@nvidia.com>
+Date: Mon, 7 Sep 2015 21:16:58 -0700
+Subject: [PATCH 2/3] util.h: Make getenv_wrapper() static inline
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise, GCC generates a "‘getenv_wrapper’ defined but not used" warning.
+
+Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+---
+ src/util.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/util.h b/src/util.h
+index 1452c06..39227ea 100644
+--- a/src/util.h
++++ b/src/util.h
+@@ -28,7 +28,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ 
+-static char * getenv_wrapper(const char *name)
++static inline char * getenv_wrapper(const char *name)
+ {
+     if (getuid() == geteuid() && getgid() == getegid()) {
+         return getenv(name);
+-- 
+1.7.2.1
+
diff --git a/0003-Fix-doc-error-on-displayable-surface-types.patch b/0003-Fix-doc-error-on-displayable-surface-types.patch
new file mode 100644
index 0000000..1aac262
--- /dev/null
+++ b/0003-Fix-doc-error-on-displayable-surface-types.patch
@@ -0,0 +1,30 @@
+From a21bf7aa438f5dd40d0a300a3167aa3d6f26dccc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Hiram=20Soltren?= <jsoltren@nvidia.com>
+Date: Wed, 9 Sep 2015 15:05:01 -0500
+Subject: [PATCH 3/3] Fix doc error on displayable surface types
+
+VdpVideoSurface is not directly displayable in the current
+implementation of VDPAU. VdpOutputSurface is. Make the documentation
+consistent with reality.
+
+Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+---
+ include/vdpau/vdpau.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/vdpau/vdpau.h b/include/vdpau/vdpau.h
+index 8cc4524..0bc5b60 100644
+--- a/include/vdpau/vdpau.h
++++ b/include/vdpau/vdpau.h
+@@ -1704,7 +1704,7 @@ typedef VdpStatus VdpVideoSurfacePutBitsYCbCr(
+  * - The Hardware that implements \ref VdpPresentationQueue
+  *   "VdpPresentationQueue" functionality,
+  *
+- * VdpVideoSurfaces are directly displayable using a \ref
++ * VdpOutputSurfaces are directly displayable using a \ref
+  * VdpPresentationQueue "VdpPresentationQueue" object.
+  *
+  * @{
+-- 
+1.7.2.1
+
diff --git a/libvdpau.spec b/libvdpau.spec
index 4666083..54135e2 100644
--- a/libvdpau.spec
+++ b/libvdpau.spec
@@ -1,10 +1,13 @@
 Name:           libvdpau
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Wrapper library for the Video Decode and Presentation API
 License:        MIT
 URL:            http://freedesktop.org/wiki/Software/VDPAU
-Source0:        http://cgit.freedesktop.org/~aplattner/%{name}/snapshot/%{name}-%{version}.tar.bz2
+Source0:        http://cgit.freedesktop.org/vdpau/libvdpau/snapshot/%{name}-%{version}.tar.bz2
+Patch0:         0001-mesa_dri2-Add-missing-include-of-config.h-to-define-.patch
+Patch1:         0002-util.h-Make-getenv_wrapper-static-inline.patch
+Patch2:         0003-Fix-doc-error-on-displayable-surface-types.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -46,6 +49,9 @@ applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 autoreconf -vif
@@ -80,6 +86,10 @@ mv doc/html-out html
 %{_libdir}/pkgconfig/vdpau.pc
 
 %changelog
+* Fri Oct 02 2015 Nicolas Chauvet <kwizart@gmail.com> - 1.1.1-2
+- Backport current patches
+- Switch to new upstream git repository on freedesktop.org
+
 * Tue Sep 01 2015 Nicolas Chauvet <kwizart@gmail.com> - 1.1.1-1
 - Update to 1.1.1
   Security fix for CVE-2015-5198, CVE-2015-5199, CVE-2015-5200