diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..1c90ca85
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "common/jack"]
+	path = common/jack
+	url = git://github.com/jackaudio/headers.git
diff --git a/common/jack b/common/jack
new file mode 160000
index 00000000..66b41b24
--- /dev/null
+++ b/common/jack
@@ -0,0 +1 @@
+Subproject commit 66b41b24b448053a73aebc383745b0f4549eb5bd
diff --git a/common/jack/control.h b/common/jack2-headers/control.h
similarity index 100%
rename from common/jack/control.h
rename to common/jack2-headers/control.h
diff --git a/common/jack/intclient.h b/common/jack2-headers/intclient.h
similarity index 100%
rename from common/jack/intclient.h
rename to common/jack2-headers/intclient.h
diff --git a/common/jack/jack.h b/common/jack2-headers/jack.h
similarity index 100%
rename from common/jack/jack.h
rename to common/jack2-headers/jack.h
diff --git a/common/jack/jslist.h b/common/jack2-headers/jslist.h
similarity index 100%
rename from common/jack/jslist.h
rename to common/jack2-headers/jslist.h
diff --git a/common/jack/midiport.h b/common/jack2-headers/midiport.h
similarity index 100%
rename from common/jack/midiport.h
rename to common/jack2-headers/midiport.h
diff --git a/common/jack/net.h b/common/jack2-headers/net.h
similarity index 100%
rename from common/jack/net.h
rename to common/jack2-headers/net.h
diff --git a/common/jack/ringbuffer.h b/common/jack2-headers/ringbuffer.h
similarity index 100%
rename from common/jack/ringbuffer.h
rename to common/jack2-headers/ringbuffer.h
diff --git a/common/jack/session.h b/common/jack2-headers/session.h
similarity index 100%
rename from common/jack/session.h
rename to common/jack2-headers/session.h
diff --git a/common/jack/statistics.h b/common/jack2-headers/statistics.h
similarity index 100%
rename from common/jack/statistics.h
rename to common/jack2-headers/statistics.h
diff --git a/common/jack/systemdeps.h b/common/jack2-headers/systemdeps.h
similarity index 100%
rename from common/jack/systemdeps.h
rename to common/jack2-headers/systemdeps.h
diff --git a/common/jack/thread.h b/common/jack2-headers/thread.h
similarity index 100%
rename from common/jack/thread.h
rename to common/jack2-headers/thread.h
diff --git a/common/jack/transport.h b/common/jack2-headers/transport.h
similarity index 100%
rename from common/jack/transport.h
rename to common/jack2-headers/transport.h
diff --git a/common/jack/types.h b/common/jack2-headers/types.h
similarity index 100%
rename from common/jack/types.h
rename to common/jack2-headers/types.h
diff --git a/common/jack/weakjack.h b/common/jack2-headers/weakjack.h
similarity index 100%
rename from common/jack/weakjack.h
rename to common/jack2-headers/weakjack.h
diff --git a/common/jack/weakmacros.h b/common/jack2-headers/weakmacros.h
similarity index 100%
rename from common/jack/weakmacros.h
rename to common/jack2-headers/weakmacros.h