diff -r 6f53b34a3a5a Config.mk
--- a/Config.mk	Fri May 07 10:41:50 2010 +0200
+++ b/Config.mk	Fri May 07 11:25:10 2010 +0200
@@ -163,15 +163,13 @@ XENSTAT_XENTOP     ?= y
 VTPM_TOOLS         ?= n
 LIBXENAPI_BINDINGS ?= n
 PYTHON_TOOLS       ?= y
-OCAML_TOOLS        ?= y
+OCAML_TOOLS        ?= n
 CONFIG_MINITERM    ?= n
 CONFIG_LOMOUNT     ?= n
 
 ifeq ($(OCAML_TOOLS),y)
 ifeq ($(CONFIG_Linux),y)
 OCAML_TOOLS := $(shell ocamlopt -v > /dev/null 2>&1 && echo "y" || echo "n")
-else
-OCAML_TOOLS := n
 endif
 endif
 
diff -r 6f53b34a3a5a tools/xenstore/Makefile
--- a/tools/xenstore/Makefile	Fri May 07 10:41:50 2010 +0200
+++ b/tools/xenstore/Makefile	Fri May 07 11:25:10 2010 +0200
@@ -27,7 +27,7 @@ xenstore xenstore-control: CFLAGS += -st
 endif
 
 ALL_TARGETS = libxenstore.so libxenstore.a clients xs_tdb_dump 
-ifneq ($(CONFIG_OCAML_XENSTORED),y)
+ifeq ($(OCAML_TOOLS),n)
  ALL_TARGETS += xenstored
 endif
 
@@ -95,6 +95,11 @@ tarball: clean
 
 .PHONY: install
 install: all
+ifeq ($(OCAML_TOOLS),n)
+	$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
+	$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
+	$(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
+endif
 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)