diff --git a/Makefile-distrib b/Makefile-distrib
index 427bba3..1dcba17 100644
--- a/Makefile-distrib
+++ b/Makefile-distrib
@@ -1,34 +1,37 @@
 
 include config
 
-version = $(shell date +"%d%m%y")
-#version = 1.0
+#version = $(shell date +"%d%m%y")
+version = 1.0-beta
+osname=$(shell uname -s)
+hardware=$(shell uname -m)
 heptdir = heptagon-$(version)
+heptbindir=$(heptdir)-$(osname)-$(hardware)
 
 binary-distrib:
 # main directory
-	mkdir -p export/$(heptdir)
+	mkdir -p export/$(heptbindir)
 # binaries
-	mkdir -p export/$(heptdir)/bin
+	mkdir -p export/$(heptbindir)/bin
 	(cd compiler/; $(MAKE))
-	cp compiler/$(COMPILER).$(TARGET) export/$(heptdir)/bin/$(COMPILER)
-	cp compiler/$(SIMULATOR).$(TARGET) export/$(heptdir)/bin/$(SIMULATOR)
+	cp compiler/$(COMPILER).$(TARGET) export/$(heptbindir)/bin/$(COMPILER)
+	cp compiler/$(SIMULATOR).$(TARGET) export/$(heptbindir)/bin/$(SIMULATOR)
 # libraries
 	(cd lib; $(MAKE))
-	cp -r lib export/$(heptdir)
+	cp -r lib export/$(heptbindir)
 # examples
-	cp -r examples export/$(heptdir)
+	cp -r examples export/$(heptbindir)
 # tests
-	mkdir -p export/$(heptdir)/test
-	cp -r test/bad test/good test/image_filters test/scripts test/CTestTestfile.cmake export/$(heptdir)/test
+	mkdir -p export/$(heptbindir)/test
+	cp -r test/bad test/good test/image_filters test/scripts test/CTestTestfile.cmake export/$(heptbindir)/test
 # manual
-	mkdir -p export/$(heptdir)/manual
-	cp manual/heptagon-manual.pdf export/$(heptdir)/manual
+	mkdir -p export/$(heptbindir)/manual
+	cp manual/heptagon-manual.pdf export/$(heptbindir)/manual
 # Makefile, config, INSTALL
-	cp config export/$(heptdir)
-	cp Makefile-bin export/$(heptdir)/Makefile
-	cp manual/INSTALL export/$(heptdir)
-	cd export; tar czf $(heptdir).tar.gz $(heptdir)
+	cp config export/$(heptbindir)
+	cp Makefile-bin export/$(heptbindir)/Makefile
+	cp manual/INSTALL export/$(heptbindir)
+	cd export; tar czf $(heptbindir).tar.gz $(heptbindir)
 
 
 source-distrib:
diff --git a/compiler/_tags b/compiler/_tags
index 8698ea1..2023b06 100644
--- a/compiler/_tags
+++ b/compiler/_tags
@@ -2,7 +2,7 @@
 <**/*.ml>: debug, dtypes, pkg_ocamlgraph
 <preproc.ml>: camlp4of, use_camlp4
 true:use_menhir
-<**/*.{byte,native}>: use_unix, use_str, debug, pkg_menhirLib, pkg_ocamlgraph
+<**/*.{byte,native}>: use_unix, use_str, debug, custom, pkg_menhirLib, pkg_ocamlgraph
 
 <main/hepts.ml>: pkg_lablgtk2, thread
 <main/hepts.{byte,native}>: pkg_lablgtk2, thread
diff --git a/compiler/utilities/global/compiler_options.ml b/compiler/utilities/global/compiler_options.ml
index 163d2cd..0b85cc2 100644
--- a/compiler/utilities/global/compiler_options.ml
+++ b/compiler/utilities/global/compiler_options.ml
@@ -32,7 +32,7 @@
 open Names
 
 (* version of the compiler *)
-let version = "0.4"
+let version = "1.0"
 let date = "DATE"
 
 (* standard module *)