diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e415301
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "fira"]
+	path = fira
+	url = https://github.com/tonsky/FiraCode
diff --git a/fira b/fira
new file mode 160000
index 0000000..30862e0
--- /dev/null
+++ b/fira
@@ -0,0 +1 @@
+Subproject commit 30862e05b00f41c9179a9424e382755a5ef954f0
diff --git a/fira/FiraCode-Bold.otf b/fira/FiraCode-Bold.otf
deleted file mode 100644
index 5bc0a28..0000000
Binary files a/fira/FiraCode-Bold.otf and /dev/null differ
diff --git a/fira/FiraCode-Light.otf b/fira/FiraCode-Light.otf
deleted file mode 100644
index 5421b2e..0000000
Binary files a/fira/FiraCode-Light.otf and /dev/null differ
diff --git a/fira/FiraCode-Medium.otf b/fira/FiraCode-Medium.otf
deleted file mode 100644
index 88f6d7c..0000000
Binary files a/fira/FiraCode-Medium.otf and /dev/null differ
diff --git a/fira/FiraCode-Regular.otf b/fira/FiraCode-Regular.otf
deleted file mode 100644
index e7a9fda..0000000
Binary files a/fira/FiraCode-Regular.otf and /dev/null differ
diff --git a/fira/FiraCode-Retina.otf b/fira/FiraCode-Retina.otf
deleted file mode 100644
index 7608d7f..0000000
Binary files a/fira/FiraCode-Retina.otf and /dev/null differ
diff --git a/ligaturize.py b/ligaturize.py
index 6b3f18b..03b1ca8 100644
--- a/ligaturize.py
+++ b/ligaturize.py
@@ -38,13 +38,13 @@ def get_ligature_source(fontname):
     for weight in ['Bold', 'Retina', 'Medium', 'Regular', 'Light']:
         if fontname.endswith('-' + weight):
             # Exact match for one of the Fira Code weights
-            return 'fira/FiraCode-%s.otf' % weight
+            return 'fira/distr/otf/FiraCode-%s.otf' % weight
 
     # No exact match. Guess that we want 'Bold' if the font name has 'Bold' in
     # it, and 'Regular' otherwise.
     if 'Bold' in fontname:
-        return 'fira/FiraCode-Bold.otf'
-    return 'fira/FiraCode-Regular.otf'
+        return 'fira/distr/otf/FiraCode-Bold.otf'
+    return 'fira/distr/otf/FiraCode-Regular.otf'
 
 class LigatureCreator(object):
 
@@ -240,7 +240,7 @@ def parse_args():
     parser.add_argument("--ligature-font-path",
         type=str, default='', metavar='PATH',
         help="The file to copy ligatures from. If unspecified, ligaturize will"
-             " attempt to pick a suitable one from fira/ based on the input"
+             " attempt to pick a suitable one from fira/distr/otf/ based on the input"
              " font's weight.")
     parser.add_argument("--copy-character-glyphs",
         default=False, action='store_true',