diff --git a/.gitignore b/.gitignore
index afd63e06a0..8b09e4783f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,6 @@ mavlink/include/mavlink/v0.9/
 /nuttx-configs/px4io-v1/src/.depend
 /nuttx-configs/px4io-v1/src/Make.dep
 /nuttx-configs/px4io-v1/src/libboard.a
-/NuttX
 /Documentation/doxy.log
 /Documentation/html/
 /Documentation/doxygen*objdb*tmp
diff --git a/.gitmodules b/.gitmodules
index c5116c1cb8..fe2d8713a7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "mavlink/include/mavlink/v1.0"]
 	path = mavlink/include/mavlink/v1.0
 	url = https://github.com/mavlink/c_library.git
+[submodule "NuttX"]
+	path = NuttX
+	url = git://github.com/PX4/NuttX.git
diff --git a/NuttX b/NuttX
new file mode 160000
index 0000000000..2a94cc8e5b
--- /dev/null
+++ b/NuttX
@@ -0,0 +1 @@
+Subproject commit 2a94cc8e5babb7d5661aedc09201239d39644332