diff --git a/.gitignore b/.gitignore
index d12e44691..0de3379d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ hashcat
 *.pot
 *.log
 *.dSYM
-deps/**
 kernels/**
 lib/*.a
 obj/*.o
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..e69de29bb
diff --git a/.travis.yml b/.travis.yml
index aa03eaad8..0d75d488a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,7 @@ os:
   - osx
 language: c
 install:
-  - mkdir -p deps/OpenCL-Headers
-  - git clone https://github.com/KhronosGroup/OpenCL-Headers deps/OpenCL-Headers/CL
+  - git submodule update --recursive
 compiler:
   - clang
   - gcc
diff --git a/BUILD.md b/BUILD.md
index 0528999a7..a2eb80d50 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -19,8 +19,7 @@ $ git clone https://github.com/hashcat/hashcat.git
 Get a copy of the **OpenCL Headers** repository
 
 ```sh
-$ mkdir -p deps/OpenCL-Headers
-$ git clone https://github.com/KhronosGroup/OpenCL-Headers deps/OpenCL-Headers/CL
+$ git submodule update --recursive
 ```
 
 Run "make"
diff --git a/docs/changes.txt b/docs/changes.txt
index 94a785278..f29757541 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -4,6 +4,7 @@
 ## Improvements
 ##
 
+- Use .gitmodules to handle OpenCL headers depency
 - Allow loading of bcrypt hashes with signature $2b$ (February 2014)
 
 ##