diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 41c22b8436..95eccf1ef8 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -13,6 +13,7 @@ people that make the day to day of OpenSim happen.
 * Robert Adams (MisterBlue)
 * Oren Hurvitz (Kitely)
 * Kevin Cozens
+* Leal Duarte (Ubit Umarov)
 
 = Core Developers Following the White Rabbit =
 Core developers who have temporarily (we hope) gone chasing the white rabbit. 
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..493cdca619
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,43 @@
+# hey, emacs! this is a -*- makefile -*-
+#
+# OpenSim makefile
+#
+
+RUBY    = $(strip $(shell which ruby 2>/dev/null))
+ifeq ($(RUBY),)
+NANT    = nant
+else
+NANT	= $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
+endif
+
+all: prebuild
+	# @export PATH=/usr/local/bin:$(PATH)
+	${NANT}
+	find OpenSim -name \*.mdb -exec cp {} bin \; 
+
+release: prebuild
+	${NANT} -D:project.config=Release
+	find OpenSim -name \*.mdb -exec cp {} bin \;
+
+prebuild:
+	./runprebuild.sh
+
+clean:
+	# @export PATH=/usr/local/bin:$(PATH)
+	-${NANT} clean
+
+test: prebuild
+	${NANT} test
+
+test-xml: prebuild
+	${NANT} test-xml
+
+tags:
+	find OpenSim -name \*\.cs | xargs etags 
+
+cscope-tags:
+	find OpenSim -name \*\.cs -fprint cscope.files
+	cscope -b
+
+include $(wildcard Makefile.local)
+