diff --git a/dix/meson.build b/dix/meson.build
index 66bd84d9e..0ed4f8210 100644
--- a/dix/meson.build
+++ b/dix/meson.build
@@ -44,3 +44,8 @@ libxserver_main = static_library('libxserver_main',
     include_directories: inc,
     dependencies: common_dep,
 )
+
+install_data(
+    'protocol.txt',
+    install_dir: serverconfigdir,
+)
diff --git a/meson.build b/meson.build
index 47385ab03..216086ef2 100644
--- a/meson.build
+++ b/meson.build
@@ -462,7 +462,7 @@ glx_inc = include_directories('glx')
 
 top_srcdir_inc = include_directories('.')
 
-serverconfigdir = join_paths(get_option('libdir'), '/xorg')
+serverconfigdir = join_paths(get_option('libdir'), 'xorg')
 
 # Include must come first, as it sets up dix-config.h
 subdir('include')