diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 51ba97d2e65f7021541d5030ad6b91cf4ca4db61..9ad8384746ab09629bfd7d48eda9ef4afc136443 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -125,19 +125,20 @@ endif
 
 
 ### Wayland ###
-libwl_shm_plugin_la_SOURCES = video_output/wl/shm.c
-nodist_libwl_shm_plugin_la_SOURCES = video_output/wl/scaler-protocol.c
-libwl_shm_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/video_output/wl
+libwl_shm_plugin_la_SOURCES = video_output/wayland/shm.c
+nodist_libwl_shm_plugin_la_SOURCES = video_output/wayland/scaler-protocol.c
+libwl_shm_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-I$(builddir)/video_output/wayland
 libwl_shm_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)
 libwl_shm_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS)
 EXTRA_DIST += video_output/wayland/scaler.xml
 CLEANFILES += $(nodist_libwl_shm_plugin_la_SOURCES)
 if HAVE_WAYLAND
-BUILT_SOURCES += video_output/wl/scaler-client-protocol.h
+BUILT_SOURCES += video_output/wayland/scaler-client-protocol.h
 vout_LTLIBRARIES += libwl_shm_plugin.la
 endif
 
-libwl_shell_surface_plugin_la_SOURCES = video_output/wl/shell_surface.c
+libwl_shell_surface_plugin_la_SOURCES = video_output/wayland/shell_surface.c
 libwl_shell_surface_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)
 libwl_shell_surface_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS) $(LIBPTHREAD)
 if HAVE_WAYLAND
diff --git a/modules/video_output/wl/scaler.xml b/modules/video_output/wayland/scaler.xml
similarity index 100%
rename from modules/video_output/wl/scaler.xml
rename to modules/video_output/wayland/scaler.xml
diff --git a/modules/video_output/wl/shell_surface.c b/modules/video_output/wayland/shell_surface.c
similarity index 100%
rename from modules/video_output/wl/shell_surface.c
rename to modules/video_output/wayland/shell_surface.c
diff --git a/modules/video_output/wl/shm.c b/modules/video_output/wayland/shm.c
similarity index 100%
rename from modules/video_output/wl/shm.c
rename to modules/video_output/wayland/shm.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c3fede7621067d751e986bdda61282b1e02cdd90..931b515158c9728ce635ef1e738efa0f1559d228 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1176,8 +1176,8 @@ modules/video_output/msw/wingdi.c
 modules/video_output/sdl.c
 modules/video_output/vdummy.c
 modules/video_output/vmem.c
-modules/video_output/wl/shell_surface.c
-modules/video_output/wl/shm.c
+modules/video_output/wayland/shell_surface.c
+modules/video_output/wayland/shm.c
 modules/video_output/xcb/glx.c
 modules/video_output/xcb/window.c
 modules/video_output/xcb/x11.c