diff --git a/eekboard/Makefile.am b/eekboard/Makefile.am
index 4842a586..386ab902 100644
--- a/eekboard/Makefile.am
+++ b/eekboard/Makefile.am
@@ -30,6 +30,9 @@ libeekboard_la_SOURCES = $(libeekboard_sources)
 libeekboard_la_CFLAGS = -I$(top_srcdir) $(GIO2_CFLAGS)
 libeekboard_la_LIBADD = $(top_builddir)/eek/libeek.la $(GIO2_LIBS)
 
+eekboarddir = $(includedir)/eekboard-$(EEK_API_VERSION)/eekboard
+eekboard_HEADERS = $(libeekboard_headers)
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =				\
 	eekboard-$(EEK_API_VERSION).pc
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 12c10abd..e307923c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1 +1,6 @@
-src/eekboard.c
+src/server-server.c
+src/server-context.c
+src/client-main.c
+src/desktop-client.c
+src/desktop-client-main.c
+src/xml-main.c
diff --git a/src/Makefile.am b/src/Makefile.am
index f7929f20..c40d9e6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -116,6 +116,9 @@ noinst_HEADERS = \
 	$(eekboard_server_headers) \
 	$(eekboard_xml_headers)
 
+EXTRA_DIST = $(service_in_files)
+DISTCLEANFILES = $(service_DATA)
+
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = eekboard-server.service.in
 service_DATA     = $(service_in_files:.service.in=.service)