diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
new file mode 100644
index 0000000000..2edfdc025a
--- /dev/null
+++ b/demos/gtk-demo/meson.build
@@ -0,0 +1,91 @@
+demos_base = files([
+  'application_demo.c',
+  'assistant.c',
+  'builder.c',
+  'button_box.c',
+  'changedisplay.c',
+  'clipboard.c',
+  'colorsel.c',
+  'combobox.c',
+  'css_accordion.c',
+  'css_basics.c',
+  'css_blendmodes.c',
+  'css_multiplebgs.c',
+  'css_pixbufs.c',
+  'css_shadows.c',
+  'cursors.c',
+  'dialog.c',
+  'drawingarea.c',
+  'editable_cells.c',
+  'entry_buffer.c',
+  'entry_completion.c',
+  'event_axes.c',
+  'expander.c',
+  'filtermodel.c',
+  'foreigndrawing.c',
+  'gestures.c',
+  'glarea.c',
+  'headerbar.c',
+  'hypertext.c',
+  'iconview.c',
+  'iconview_edit.c',
+  'images.c',
+  'infobar.c',
+  'links.c',
+  'listbox.c',
+  'flowbox.c',
+  'list_store.c',
+  'markup.c',
+  'menus.c',
+  'modelbutton.c',
+  'offscreen_window.c',
+  'offscreen_window2.c',
+  'overlay.c',
+  'overlay2.c',
+  'panes.c',
+  'pickers.c',
+  'pixbufs.c',
+  'popover.c',
+  'printing.c',
+  'revealer.c',
+  'rotated_text.c',
+  'scale.c',
+  'search_entry.c',
+  'search_entry2.c',
+  'shortcuts.c',
+  'sidebar.c',
+  'sizegroup.c',
+  'spinbutton.c',
+  'spinner.c',
+  'stack.c',
+  'textmask.c',
+  'textview.c',
+  'textscroll.c',
+  'theming_style_classes.c',
+  'toolpalette.c',
+  'transparent.c',
+  'tree_store.c',
+
+      'font_features.c', #TODO: IF BUILD_FONT_DEMO
+  'pagesetup.c' #TODO: IF OS_UNIX
+])
+
+gtkdemo_sources = demos_base + files([
+  'main.c',
+])
+
+
+gtkdemo_resources = gnome.compile_resources(
+  'gtkdemo_resources',
+  'demo.gresource.xml',
+  source_dir: '.'
+)
+
+gtkdemo = executable(
+  'gtk3-demo',
+  gtkdemo_sources,
+  gtkdemo_resources,
+  dependencies: [libgtk_dep, harfbuzz_dep],
+  include_directories : confinc,
+  gui_app: true
+)
diff --git a/demos/meson.build b/demos/meson.build
index eec48fda01..2fdd19151d 100644
--- a/demos/meson.build
+++ b/demos/meson.build
@@ -1,2 +1,3 @@
   subdir('icon-browser')
   subdir('widget-factory')
+  subdir('gtk-demo')
diff --git a/gtk/meson.build b/gtk/meson.build
index b0745575fc..9aeaf4a440 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -826,7 +826,6 @@ libgtk = shared_library('gtk',
   ],
   include_directories: [ confinc, gdkinc, gtkinc ],
   dependencies: [gtk_deps, libgdk_dep],
-  link_with: libgdk
 )
 
 libgtk_dep = declare_dependency(
@@ -837,6 +836,6 @@ libgtk_dep = declare_dependency(
     gtktypebuiltins_h,
   ],
   dependencies: gtk_deps,
-  link_with: [libgtk, libgdk],
+  link_with: libgtk,
   include_directories: [confinc, gtkinc]
 )
diff --git a/meson.build b/meson.build
index 9db92a5364..07fc5d6e7b 100644
--- a/meson.build
+++ b/meson.build
@@ -172,6 +172,7 @@ wlprotocolsdep = dependency('wayland-protocols', version: '>= 1.7')
 wlcursordep    = dependency('wayland-cursor')
 wlegldep       = dependency('wayland-egl')
 xrandr_dep     = dependency('xrandr')
+harfbuzz_dep   = dependency('harfbuzz', version: '>= 0.9')
 
 if giounix_dep.found()
   cdata.set('HAVE_GIO_UNIX', 1)
diff --git a/meson_options.txt b/meson_options.txt
index e8f8ee60e9..de17fcc351 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,3 @@
 option('enable-x11-backend', type: 'boolean', value: 'true')
 option('enable-wayland-backend', type: 'boolean', value: 'true')
-option('enable-broadway-backend', type: 'boolean', value: 'false')
+option('enable-broadway-backend', type: 'boolean', value: 'true')