diff --git a/gtk3.changes b/gtk3.changes
index fc563a5..278c139 100644
--- a/gtk3.changes
+++ b/gtk3.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jun 16 19:31:53 CEST 2011 - vuntz@opensuse.org
+
+- Pass --enable-x11-backend to configure to make sure we always
+  build the X11 backend, that we always want.
+- Add a build_broadway_backend define, that controls whether we
+  build the broadway (HTML5!) backend. If set:
+  + we pass --enable-broadway-backend to configure
+  + we package the additional files
+- Set build_broadway_backend to 1 for now, so people can play with
+  the backend.
+
 -------------------------------------------------------------------
 Wed Jun 15 10:25:43 CEST 2011 - dimstar@opensuse.org
 
diff --git a/gtk3.spec b/gtk3.spec
index 44d3505..620fa07 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -16,6 +16,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%define build_broadway_backend 1
 
 # When updating the binary version, do not forget to also update baselibs.conf
 %define gtk_binary_version 3.0.0
@@ -284,6 +285,10 @@ gnome-patch-translation-update
 %configure \
         --disable-static \
         --enable-man \
+        --enable-x11-backend \
+%if %{build_broadway_backend}
+        --enable-broadway-backend \
+%endif
         --enable-introspection
 %{__make} V=1 %{?_smp_mflags}
 
@@ -522,8 +527,14 @@ fi
 %{_libdir}/gtk-3.0/modules/libferret.so
 %{_libdir}/pkgconfig/gail-3.0.pc
 %{_libdir}/pkgconfig/gdk-3.0.pc
+%if %{build_broadway_backend}
+%{_libdir}/pkgconfig/gdk-broadway-3.0.pc
+%endif
 %{_libdir}/pkgconfig/gdk-x11-3.0.pc
 %{_libdir}/pkgconfig/gtk+-3.0.pc
+%if %{build_broadway_backend}
+%{_libdir}/pkgconfig/gtk+-broadway-3.0.pc
+%endif
 %{_libdir}/pkgconfig/gtk+-unix-print-3.0.pc
 %{_libdir}/pkgconfig/gtk+-x11-3.0.pc
 %{_libdir}/libgailutil-3.so