diff --git a/.gitmodules b/.gitmodules
index 41a166d11..a952646d1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "verilog/mor1kx/submodule"]
 	path = verilog/mor1kx/submodule
 	url = https://github.com/openrisc/mor1kx.git
+[submodule "software/compiler-rt"]
+	path = software/compiler-rt
+	url = http://llvm.org/git/compiler-rt.git
diff --git a/software/compiler-rt b/software/compiler-rt
new file mode 160000
index 000000000..a1448787a
--- /dev/null
+++ b/software/compiler-rt
@@ -0,0 +1 @@
+Subproject commit a1448787a069603414e716adc8a41f866e28a4b4
diff --git a/software/libcompiler-rt/Makefile b/software/libcompiler-rt/Makefile
index d7aa03bc0..c66d53ed9 100644
--- a/software/libcompiler-rt/Makefile
+++ b/software/libcompiler-rt/Makefile
@@ -16,7 +16,7 @@ libcompiler-rt.a: $(OBJECTS)
 	$(AR) clr libcompiler-rt.a $(OBJECTS)
 	$(RANLIB) libcompiler-rt.a
 
-%.o: $(CRTDIR)/lib/builtins/%.c
+%.o: $(MSCDIR)/software/compiler-rt/lib/builtins/%.c
 	$(compile-dep)
 
 .PHONY: clean