diff --git a/Makefile b/Makefile
index 6ff56b2..83aec30 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ MODS = $(wildcard src/*.erl)
 BEAMS = $(MODS:src/%.erl=ebin/%.beam)
 TEST_MODS = $(wildcard test/*.erl)
 TEST_BEAMS = $(TEST_MODS:test/%.erl=test/%.beam)
+YAWS_ROOT=/usr/lib/yaws/timestamper
 
 all : compile test
 
@@ -36,3 +37,16 @@ ebin/%.beam : src/%.erl
 test/%.beam : test/%.erl
 	@echo Compiling sources...
 	erlc -W -o test $<
+
+deploy: compile
+	@service yaws stop
+	@echo Removing existing artifacts.
+	@rm -r $(YAWS_ROOT)/*
+	@echo Copying current artifacts.
+	@cp -r www $(YAWS_ROOT)
+	@cp -r ebin $(YAWS_ROOT)
+	@mkdir $(YAWS_ROOT)/include
+	@cp -r src/ts_db_records.hrl $(YAWS_ROOT)/include/.
+	@cp yaws.prod.conf $(YAWS_ROOT)/yaws.conf
+	@service yaws start
+	@echo Done.
diff --git a/src/timestamper.erl b/src/timestamper.erl
index aaa035e..928a962 100644
--- a/src/timestamper.erl
+++ b/src/timestamper.erl
@@ -3,7 +3,6 @@
 
 start() ->
     ok = application:load(mnesia),
-    ok = application:set_env(mnesia, dir, "/home/jdbernard/projects/timestamper/web-app/db/test"),
     ok = mnesia:start(),
     ok.
 
@@ -12,5 +11,5 @@ create_tables(Nodes) ->
     {atomic, ok} = id_counter:create_table(TableOpts),
     {atomic, ok} = ts_user:create_table(TableOpts),
     {atomic, ok} = ts_timeline:create_table(TableOpts),
-    {atmoic, ok} = ts_entry:create_table(TableOpts),
+    {atomic, ok} = ts_entry:create_table(TableOpts),
     ok.
diff --git a/yaws.conf b/yaws.dev.conf
similarity index 100%
rename from yaws.conf
rename to yaws.dev.conf
diff --git a/yaws.prod.conf b/yaws.prod.conf
new file mode 100644
index 0000000..0e2c8cc
--- /dev/null
+++ b/yaws.prod.conf
@@ -0,0 +1,11 @@
+ebin_dir = /usr/lib/yaws/timestamper/ebin
+include_dir = /usr/lib/yaws/timestamper/include
+
+runmod = timestamper
+
+<server timestamper.jdbernard.com>
+    port = 80
+    listen = 0.0.0.0
+    docroot = /usr/lib/yaws/timestamper/www
+    appmods = ts_api
+</server>