diff --git a/include/sway/server.h b/include/sway/server.h
index bfdb7b8a..3fa72e84 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -31,6 +31,9 @@ struct sway_server {
 	struct wlr_xdg_shell_v6 *xdg_shell_v6;
 	struct wl_listener xdg_shell_v6_surface;
 
+	struct wlr_xwayland *xwayland;
+	struct wl_listener xwayland_surface;
+
 	struct wlr_wl_shell *wl_shell;
 	struct wl_listener wl_shell_surface;
 };
@@ -45,6 +48,7 @@ void output_add_notify(struct wl_listener *listener, void *data);
 void output_remove_notify(struct wl_listener *listener, void *data);
 
 void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
+void handle_xwayland_surface(struct wl_listener *listener, void *data);
 void handle_wl_shell_surface(struct wl_listener *listener, void *data);
 
 #endif
diff --git a/include/sway/view.h b/include/sway/view.h
index 7aa04794..83ac8285 100644
--- a/include/sway/view.h
+++ b/include/sway/view.h
@@ -3,6 +3,7 @@
 #include <wayland-server.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
+#include <wlr/xwayland.h>
 
 struct sway_container;
 struct sway_view;
@@ -19,6 +20,19 @@ struct sway_xdg_surface_v6 {
 	int pending_width, pending_height;
 };
 
+struct sway_xwayland_surface {
+	struct sway_view *view;
+
+	struct wl_listener commit;
+	struct wl_listener request_move;
+	struct wl_listener request_resize;
+	struct wl_listener request_maximize;
+	struct wl_listener request_configure;
+	struct wl_listener destroy;
+
+	int pending_width, pending_height;
+};
+
 struct sway_wl_shell_surface {
 	struct sway_view *view;
 
@@ -58,11 +72,13 @@ struct sway_view {
 
 	union {
 		struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
+		struct wlr_xwayland_surface *wlr_xwayland_surface;
 		struct wlr_wl_shell_surface *wlr_wl_shell_surface;
 	};
 
 	union {
 		struct sway_xdg_surface_v6 *sway_xdg_surface_v6;
+		struct sway_xwayland_surface *sway_xwayland_surface;
 		struct sway_wl_shell_surface *sway_wl_shell_surface;
 	};
 
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
new file mode 100644
index 00000000..04ec118d
--- /dev/null
+++ b/sway/desktop/xwayland.c
@@ -0,0 +1,134 @@
+#define _POSIX_C_SOURCE 199309L
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wayland-server.h>
+#include <wlr/xwayland.h>
+#include "sway/container.h"
+#include "sway/layout.h"
+#include "sway/server.h"
+#include "sway/view.h"
+#include "log.h"
+
+ static bool assert_xwayland(struct sway_view *view) {
+	 return sway_assert(view->type == SWAY_XWAYLAND_VIEW,
+		 "Expected xwayland view!");
+ }
+
+static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) {
+	if (!assert_xwayland(view)) {
+		return NULL;
+	}
+	switch (prop) {
+	case VIEW_PROP_TITLE:
+		return view->wlr_xwayland_surface->title;
+	case VIEW_PROP_CLASS:
+		return view->wlr_xwayland_surface->class;
+	default:
+		return NULL;
+	}
+}
+
+static void set_size(struct sway_view *view, int width, int height) {
+	if (!assert_xwayland(view)) {
+		return;
+	}
+	view->sway_xwayland_surface->pending_width = width;
+	view->sway_xwayland_surface->pending_height = height;
+
+	struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
+	wlr_xwayland_surface_configure(xsurface, view->swayc->x, view->swayc->y,
+		width, height);
+}
+
+static void handle_commit(struct wl_listener *listener, void *data) {
+	struct sway_xwayland_surface *sway_surface =
+		wl_container_of(listener, sway_surface, commit);
+	struct sway_view *view = sway_surface->view;
+	sway_log(L_DEBUG, "xwayland surface commit %dx%d",
+		sway_surface->pending_width, sway_surface->pending_height);
+	// NOTE: We intentionally discard the view's desired width here
+	// TODO: Let floating views do whatever
+	view->width = sway_surface->pending_width;
+	view->height = sway_surface->pending_height;
+}
+
+static void handle_destroy(struct wl_listener *listener, void *data) {
+	struct sway_xwayland_surface *sway_surface =
+		wl_container_of(listener, sway_surface, destroy);
+	wl_list_remove(&sway_surface->commit.link);
+	wl_list_remove(&sway_surface->destroy.link);
+	wl_list_remove(&sway_surface->request_configure.link);
+	swayc_t *parent = destroy_view(sway_surface->view->swayc);
+	free(sway_surface->view);
+	free(sway_surface);
+	arrange_windows(parent, -1, -1);
+}
+
+static void handle_configure_request(struct wl_listener *listener, void *data) {
+	struct sway_xwayland_surface *sway_surface =
+		wl_container_of(listener, sway_surface, request_configure);
+	struct wlr_xwayland_surface_configure_event *ev = data;
+	struct sway_view *view = sway_surface->view;
+	struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
+	// TODO: floating windows are allowed to move around like this, but make
+	// sure tiling windows always stay in place.
+	wlr_xwayland_surface_configure(xsurface, ev->x, ev->y,
+		ev->width, ev->height);
+}
+
+void handle_xwayland_surface(struct wl_listener *listener, void *data) {
+	struct sway_server *server = wl_container_of(
+			listener, server, xwayland_surface);
+	struct wlr_xwayland_surface *xsurface = data;
+
+	if (xsurface->override_redirect) {
+		// TODO: floating popups
+		return;
+	}
+
+	sway_log(L_DEBUG, "New xwayland surface title='%s' class='%s'",
+			xsurface->title, xsurface->class);
+
+	struct sway_xwayland_surface *sway_surface =
+		calloc(1, sizeof(struct sway_xwayland_surface));
+	if (!sway_assert(sway_surface, "Failed to allocate surface!")) {
+		return;
+	}
+
+	struct sway_view *sway_view = calloc(1, sizeof(struct sway_view));
+	if (!sway_assert(sway_view, "Failed to allocate view!")) {
+		return;
+	}
+	sway_view->type = SWAY_XWAYLAND_VIEW;
+	sway_view->iface.get_prop = get_prop;
+	sway_view->iface.set_size = set_size;
+	sway_view->wlr_xwayland_surface = xsurface;
+	sway_view->sway_xwayland_surface = sway_surface;
+	// TODO remove from the tree when the surface goes away (unmapped)
+	sway_view->surface = xsurface->surface;
+	sway_surface->view = sway_view;
+	
+	// TODO:
+	// - Wire up listeners
+	// - Handle popups
+	// - Look up pid and open on appropriate workspace
+	// - Set new view to maximized so it behaves nicely
+	// - Criteria
+	
+	sway_surface->commit.notify = handle_commit;
+	wl_signal_add(&xsurface->surface->events.commit, &sway_surface->commit);
+	sway_surface->destroy.notify = handle_destroy;
+	wl_signal_add(&xsurface->events.destroy, &sway_surface->destroy);
+	sway_surface->request_configure.notify = handle_configure_request;
+	wl_signal_add(&xsurface->events.request_configure,
+		&sway_surface->request_configure);
+
+	// TODO: actual focus semantics
+	swayc_t *parent = root_container.children->items[0];
+	parent = parent->children->items[0]; // workspace
+
+	swayc_t *cont = new_view(parent, sway_view);
+	sway_view->swayc = cont;
+
+	arrange_windows(cont->parent, -1, -1);
+}
diff --git a/sway/meson.build b/sway/meson.build
index dd3570bf..9f92f5d1 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -8,6 +8,7 @@ sway_sources = files(
 	'desktop/output.c',
 	'desktop/wl_shell.c',
 	'desktop/xdg_shell_v6.c',
+	'desktop/xwayland.c',
 	'tree/container.c',
 	'tree/layout.c',
 	'tree/workspace.c',
diff --git a/sway/server.c b/sway/server.c
index bf5c37eb..024d8429 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -41,6 +41,13 @@ bool server_init(struct sway_server *server) {
 		&server->xdg_shell_v6_surface);
 	server->xdg_shell_v6_surface.notify = handle_xdg_shell_v6_surface;
 
+	// TODO make xwayland optional
+	server->xwayland =
+		wlr_xwayland_create(server->wl_display, server->compositor);
+	wl_signal_add(&server->xwayland->events.new_surface,
+		&server->xwayland_surface);
+	server->xwayland_surface.notify = handle_xwayland_surface;
+
 	server->wl_shell = wlr_wl_shell_create(server->wl_display);
 	wl_signal_add(&server->wl_shell->events.new_surface,
 		&server->wl_shell_surface);