diff --git a/Makefile.in b/Makefile.in
index 8fc749a..7cd64b9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,18 +1,37 @@
-SCX=@SCX@
-ORION-WM=orion-wm
+PACKAGE_VERSION = @PACKAGE_VERSION@
+
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+libdir = @libdir@
+
+schemedir = @schemedir@
+SCSH = @SCSH@
+
+mkinstalldirs = $(SHELL) $(srcdir)/mkinstalldirs
+
+ORION-WM=orion
+
 
 enough: $(ORION-WM)
 
 # --------------------
 # Distribution...
 
-distdir = /tmp
+ distdir = /tmp
 
 # DISTFILES should include all sources.
 DISTFILES = COPYING INSTALL README configure configure.in Makefile.in	\
-		src/*.scm doc/*.html
+	    mkinstalldirs install-sh src/*.scm doc/*.html
 
-distname = $(ORION-WM)-0.1
+distname = $(ORION-WM)-$(PACKAGE_VERSION)
 
 .PHONY : dist
 dist: 
@@ -27,21 +46,56 @@ dist:
                        files="$$files $$distname/$$i";         		\
                 done &&                                                 \
                 tar -cf - $$files |                                     \
-                        gzip --best >$$distfile &&                      \
+                       gzip --best >$$distfile &&                      \
                 rm $$distname;                                          \
         else                                                            \
                 echo "Can't write $$distfile" >&2;                      \
-                exit 1;                                                 \
+                 exit 1;                                                 \
         fi
 
+scheme_DATA = \
+	src/button.scm \
+	src/file-name-completion.scm \
+	src/manager.scm \
+	src/move-wm.scm \
+	src/root-manager.scm \
+	src/titlebar.scm \
+	src/config.scm \
+	src/key-grab.scm \
+	src/move-wm-icon.scm \
+	src/packages.scm \
+	src/split-wm.scm \
+	src/utils.scm \
+	src/drag-window.scm \
+	src/main.scm \
+	src/move-wm-resizer.scm \
+	src/prompt.scm \
+	src/switch-wm.scm \
+	src/main.scm
 
-$(ORION-WM): Makefile
-	script=$(ORION-WM) && \
-	echo "#!$(SCX) \\" > $$script && \
-	echo "-lm `pwd`/src/packages.scm -m main -s" >> $$script && \
-	echo '!#' >> $$script && \
-	echo '(start)' >> $$script && \
-	chmod 755 $$script
+$(ORION-WM): $(srcdir)/orion.in
+	sed -e "s|@orionscsh@|${SCSH}|g" 						\
+	    -e "s|@orionschemedir@|`pwd`/src/|g" $< > $@ &&				\
+	chmod a+x $@
+
+install: install-orion install-scheme
+
+install-orion:
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	sed -e "s|@orionscsh@|${SCSH}|g" 						\
+	    -e "s|@orionschemedir@|$(schemedir)|g"					\
+	    $(srcdir)/orion.in 								\
+	    > $(DESTDIR)$(bindir)/$(ORION-WM) &&
+	chmod a+x $(DESTDIR)$(bindir)/$(ORION-WM)
+
+install-scheme:
+	$(mkinstalldirs) $(DESTDIR)$(schemedir)
+	@list='$(scheme_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(schemeDATA_INSTALL) $$d$$p $(DESTDIR)$(schemedir)/$$f"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(schemedir)/$$f; \
+	done
 
 clean:
 	rm -f $(ORION-WM)
\ No newline at end of file
diff --git a/configure.in b/configure.in
index 6b28671..73dd675 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,17 @@
-AC_INIT
-	AC_ARG_WITH(scx, [  --with-scx=FILE         the scx binary to use [/usr/local/bin/scx]],
-		scx_binary=$withval , scx_binary=/usr/local/bin/scx)
-	AC_SUBST(scx_binary)
+AC_INIT(orion, 0.2)
+AC_CONFIG_SRCDIR(configure.in)
 
-	AC_PATH_PROG(SCX, scx, $scx_binary)
+AC_PROG_INSTALL
 
-AC_OUTPUT(Makefile)
+AC_ARG_WITH(scsh,
+            AC_HELP_STRING([--with-scsh=FILE],
+                           [the scsh binary to use @<:@scsh from PATH@:>@]),
+            SCSH=$withval)
 
+AC_PATH_PROG([SCSH], [scsh], AC_MSG_ERROR([Cannot find scsh executable]))
+
+schemedir='${libdir}'"/orion/scheme"
+AC_SUBST(schemedir)
+
+AC_CONFIG_FILES(Makefile)
+AC_OUTPUT
diff --git a/src/packages.scm b/src/packages.scm
index 54e791e..0f7df4b 100644
--- a/src/packages.scm
+++ b/src/packages.scm
@@ -226,7 +226,7 @@
   (files root-manager))
 
 (define-structure main
-  (export start)
+  (export start orion-wm)
   (open scsh scheme threads handle
 	xlib
 	manager root-manager config