diff --git a/0002-freerdp2-32bpp.patch b/0002-freerdp2-32bpp.patch
new file mode 100644
index 0000000..f429c1c
--- /dev/null
+++ b/0002-freerdp2-32bpp.patch
@@ -0,0 +1,57 @@
+diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c
+index b731f9b..7c806bf 100644
+--- a/plugins/rdp/vinagre-rdp-tab.c
++++ b/plugins/rdp/vinagre-rdp-tab.c
+@@ -574,45 +574,49 @@ frdp_pre_connect (freerdp *instance)
+   settings->order_support[NEG_POLYGON_CB_INDEX] = false;
+   settings->order_support[NEG_ELLIPSE_SC_INDEX] = false;
+   settings->order_support[NEG_ELLIPSE_CB_INDEX] = false;
+ #endif
+ 
+   return TRUE;
+ }
+ 
+ static BOOL
+ frdp_post_connect (freerdp *instance)
+ {
+   VinagreRdpTab        *rdp_tab = ((frdpContext *) instance->context)->rdp_tab;
+   VinagreRdpTabPrivate *priv = rdp_tab->priv;
+   rdpGdi               *gdi;
+   int                   stride;
+ 
+   gdi_init (instance,
+ #if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
+     !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \
+     FREERDP_VERSION_MINOR >= 2))
+-                    CLRBUF_24BPP,
++                    CLRBUF_24BPP, NULL
+ #else
+-                    CLRBUF_32BPP,
++#ifdef CLRBUF_32BPP
++                    CLRBUF_32BPP, NULL
++#else
++                    PIXEL_FORMAT_BGRA32
++#endif
+ #endif
+-                    NULL);
++                    );
+   gdi = instance->context->gdi;
+ 
+   instance->update->BeginPaint = frdp_begin_paint;
+   instance->update->EndPaint = frdp_end_paint;
+ 
+   stride = cairo_format_stride_for_width (CAIRO_FORMAT_RGB24, gdi->width);
+   rdp_tab->priv->surface = cairo_image_surface_create_for_data ((unsigned char*) gdi->primary_buffer,
+                                                                 CAIRO_FORMAT_RGB24,
+                                                                 gdi->width,
+                                                                 gdi->height,
+                                                                 stride);
+   gtk_widget_queue_draw_area (priv->display,
+                               0, 0,
+                               gdi->width, gdi->height);
+ 
+   vinagre_tab_save_credentials_in_keyring (VINAGRE_TAB (rdp_tab));
+   vinagre_tab_add_recent_used (VINAGRE_TAB (rdp_tab));
+   vinagre_tab_set_state (VINAGRE_TAB (rdp_tab), VINAGRE_TAB_STATE_CONNECTED);
+ 
+   return TRUE;
diff --git a/vinagre.spec b/vinagre.spec
index 2d9de77..516f020 100644
--- a/vinagre.spec
+++ b/vinagre.spec
@@ -4,7 +4,7 @@
 
 Name:           vinagre
 Version:        3.22.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        VNC client for GNOME
 
 Group:          Applications/System
@@ -15,13 +15,15 @@ Source0:        https://download.gnome.org/sources/%{name}/3.22/%{name}-%{versio
 # Handle changed freerdp pkgconfig module name
 # https://bugzilla.gnome.org/show_bug.cgi?id=765444
 Patch0:         0001-handle-new-freerdp-pkgconfig-name.patch
+# CLRBUF_32BPP might be undefined with latest freerdp
+Patch1:         0002-freerdp2-32bpp.patch
 
 %if 0%{?with_spice}
 BuildRequires:  pkgconfig(spice-client-gtk-3.0)
 %endif
 BuildRequires:  pkgconfig(avahi-gobject)
 BuildRequires:  pkgconfig(avahi-ui-gtk3)
-%if 0%{?fedora}
+%if 0%{?fedora} < 27 && 0%{?rhel} <= 7
 BuildRequires:  freerdp1.2-devel
 %else
 BuildRequires:  pkgconfig(freerdp2)
@@ -64,7 +66,10 @@ Apart from the VNC protocol, vinagre supports Spice and RDP.
 
 
 %prep
-%autosetup
+#%%autosetup -v
+%setup -q
+%patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -94,7 +99,12 @@ make check
 %doc AUTHORS NEWS README
 %license COPYING
 %{_bindir}/vinagre
+#%%if 0%{?fedora} < 27 && 0%{?rhel} <= 7
+%if 0%{?fedora} < 27
 %{_datadir}/appdata/*.appdata.xml
+%else
+%{_datadir}/metainfo/*.appdata.xml
+%endif
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mime/packages/vinagre-mime.xml
@@ -109,6 +119,9 @@ make check
 
 
 %changelog
+* Thu Jan 25 2018 Karsten Hopp <karsten@redhat.com> - 3.22.0-8
+- build with freerdp2
+
 * Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.22.0-7
 - Remove obsolete scriptlets