diff --git a/configure.ac b/configure.ac
index 102704eb..5b4f366b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,7 @@ services/console/interface/memphis/Makefile
 services/console/interface/network/Makefile
 services/console/interface/logviewer/Makefile
 services/console/interface/terminal/Makefile
+services/console/interface/xserver/Makefile
 sugar/Makefile
 sugar/activity/Makefile
 sugar/bundle/Makefile
diff --git a/services/console/interface/Makefile.am b/services/console/interface/Makefile.am
index ef0f3e4f..bd63b56e 100644
--- a/services/console/interface/Makefile.am
+++ b/services/console/interface/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = memphis network logviewer terminal xo
+SUBDIRS = memphis network logviewer terminal xo xserver
 
 sugardir = $(pkgdatadir)/services/console/interface
 sugar_PYTHON =				\
diff --git a/services/console/lib/Makefile.am b/services/console/lib/Makefile.am
index 238c4356..c48a0c1a 100644
--- a/services/console/lib/Makefile.am
+++ b/services/console/lib/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = procmem graphics net ui
 
-sugardir = $(pkgdatadir)/shell/console/lib
+sugardir = $(pkgdatadir)/services/console/lib
 sugar_PYTHON =                          \
         pyxres.py