diff --git a/Makefile b/Makefile
index d9aa61f..8137f28 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,19 @@
+REBAR?=./rebar
 
 all: build
 
 clean:
-	./rebar clean
+	$(REBAR) clean
 	rm -rf logs
 	rm -rf .eunit
-	rm test/*.beam
+	rm -f test/*.beam
 
 deps: ./deps/
-	./rebar get-deps update-deps
+	$(REBAR) get-deps update-deps
 
 
 build: deps
-	./rebar compile
+	$(REBAR) compile
 
 
 etap: test/etap.beam test/util.beam
@@ -20,7 +21,7 @@ etap: test/etap.beam test/util.beam
 
 
 eunit:
-	./rebar eunit skip_deps=true
+	$(REBAR) eunit skip_deps=true
 
 
 check: etap eunit
diff --git a/c_src/decoder.c b/c_src/decoder.c
index e8d3ac9..a6fc8fe 100644
--- a/c_src/decoder.c
+++ b/c_src/decoder.c
@@ -16,6 +16,10 @@
 #define STACK_SIZE_INC 64
 #define NUM_BUF_LEN 32
 
+#ifdef WINDOWS || WIN32
+#define snprintf  _snprintf
+#endif
+
 enum {
     st_value=0,
     st_object,
diff --git a/c_src/encoder.c b/c_src/encoder.c
index ec605e8..ce1faed 100644
--- a/c_src/encoder.c
+++ b/c_src/encoder.c
@@ -20,6 +20,10 @@ do {                                \
     }                               \
 } while(0)
 
+#ifdef WINDOWS || WIN32
+#define inline __inline
+#define snprintf  _snprintf
+#endif
 
 typedef struct {
     ErlNifEnv*      env;
diff --git a/rebar b/rebar
index b75aa6d..f4b5f3b 100755
Binary files a/rebar and b/rebar differ
diff --git a/rebar.config b/rebar.config
index 8715924..d6eb828 100644
--- a/rebar.config
+++ b/rebar.config
@@ -4,7 +4,7 @@
 
 {port_specs, [{"priv/jiffy.so", ["c_src/*.c"]}]}.
 
-{port_envs, [
+{port_env, [
     %% Link the spidermonkey library
     {".*", "CFLAGS", "$CFLAGS -g -Wall"},