diff --git a/Makefile b/Makefile.contiki
similarity index 100%
rename from Makefile
rename to Makefile.contiki
diff --git a/config.h b/config.h.contiki
similarity index 100%
rename from config.h
rename to config.h.contiki
diff --git a/configure.in b/configure.in
index 0fa23686..25c28be2 100644
--- a/configure.in
+++ b/configure.in
@@ -7,9 +7,18 @@
 # README for terms of use. 
 
 AC_PREREQ([2.65])
-AC_INIT([libcoap], [0.6.0])
+AC_INIT([libcoap], [1.8.0])
 AC_CONFIG_SRCDIR([coap.h])
 
+# First check for Contiki build to quit configure before any other test
+AC_ARG_WITH(contiki,
+  [AS_HELP_STRING([--with-contiki],[build libcoap for the Contiki OS])],
+  [cp -p Makefile.contiki Makefile
+   cp -p config.h.contiki config.h
+   AC_MSG_NOTICE([Contiki build prepared])
+   exit 0], 
+  [])
+
 # Checks for programs.
 AC_PROG_MAKE_SET
 AC_PROG_CC