diff --git a/.gitmodules b/.gitmodules
index c0402d0c..9ffac0c8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,3 +11,6 @@
 [submodule "third_party/r2d2"]
 	path = third_party/r2d2
 	url = https://github.com/naver/r2d2.git
+[submodule "third_party/disk"]
+	path = third_party/disk
+	url = https://github.com/cvlab-epfl/disk.git
diff --git a/hloc/extractors/disk.py b/hloc/extractors/disk.py
new file mode 100644
index 00000000..4545eb0e
--- /dev/null
+++ b/hloc/extractors/disk.py
@@ -0,0 +1,93 @@
+import sys
+from pathlib import Path
+from functools import partial
+import torch
+import torch.nn.functional as F
+
+from ..utils.base_model import BaseModel
+
+disk_path = Path(__file__).parent / "../../third_party/disk"
+sys.path.append(str(disk_path))
+from disk import DISK as _DISK
+
+
+class DISK(BaseModel):
+    default_conf = {
+        'model_name': 'depth-save.pth',
+        'max_keypoints': None,
+        'desc_dim': 128,
+        'mode': 'nms',
+        'nms_window_size': 5,
+    }
+    required_inputs = ['image']
+
+    def _init(self, conf):
+        state_dict = torch.load(disk_path/conf['model_name'],
+                                map_location='cpu')
+
+        if 'extractor' in state_dict:
+            weights = state_dict['extractor']
+        elif 'disk' in state_dict:
+            weights = state_dict['disk']
+        else:
+            raise KeyError('Incompatible weight file!')
+        self.model = _DISK(window=8, desc_dim=conf['desc_dim'])
+        self.model.load_state_dict(weights)
+        if conf['mode'] == 'nms':
+            self.extract = partial(
+                self.model.features,
+                kind='nms',
+                window_size=conf['nms_window_size'],
+                cutoff=0.,
+                n=conf['max_keypoints']
+            )
+        elif conf['mode'] == 'rng':
+            self.extract = partial(self.model.features, kind='rng')
+        else:
+            raise KeyError('mode must be either nms or rng!')
+
+    def _forward(self, data):
+        img = data['image'][0]
+        assert len(img.shape) == 3 and img.shape[0] == 3
+        # pad img so that its height and width be the multiple of 16
+        # as required by the original dis repo
+        orig_h, orig_w = img.shape[1:]
+        new_h = ((orig_h-1)//16 + 1) * 16
+        new_w = ((orig_w-1)//16 + 1) * 16
+        y_pad = new_h - orig_h
+        x_pad = new_w - orig_w
+
+        img = F.pad(img, (0, x_pad, 0, y_pad))
+        assert img.shape[1] == new_h and img.shape[2] == new_w, "Wrong Padding"
+
+        batched_features = self.extract(img[None])  # add batch dimension
+
+        assert(len(batched_features) == 1)
+        features = batched_features[0]
+        for features in batched_features.flat:
+            features = features.to(torch.device('cpu'))
+
+        kps_crop_space = features.kp.t()
+
+        kps_img_space = kps_crop_space  # (2, N)
+        x = kps_crop_space[0, :]
+        y = kps_crop_space[1, :]
+        mask = (0 <= x) & (x <= orig_w-1) & (0 <= y) & (y <= orig_h-1)
+
+        keypoints = kps_img_space.t()[mask]
+        descriptors = features.desc[mask]
+        scores = features.kp_logp[mask]
+
+        order = torch.argsort(-scores)
+
+        keypoints = keypoints[order]
+        descriptors = descriptors[order]
+        scores = scores[order]
+
+        assert descriptors.shape[1] == self.conf['desc_dim']
+        assert keypoints.shape[1] == 2
+
+        pred = {'keypoints': keypoints[None],
+                'descriptors': descriptors.t()[None],
+                'scores': scores[None]}
+        return pred
diff --git a/third_party/disk b/third_party/disk
new file mode 160000
index 00000000..eafa0ee8
--- /dev/null
+++ b/third_party/disk
@@ -0,0 +1 @@
+Subproject commit eafa0ee80d26f86d6c838b78cea8ae4c9abd4b51