diff --git a/nbgitpuller/__init__.py b/nbgitpuller/__init__.py
index 54870226..b5941286 100644
--- a/nbgitpuller/__init__.py
+++ b/nbgitpuller/__init__.py
@@ -28,3 +28,5 @@ def load_jupyter_server_extension(nbapp):
     ]
     web_app.settings['nbapp'] = nbapp
     web_app.add_handlers('.*', handlers)
+
+_load_jupyter_server_extension = load_jupyter_server_extension
diff --git a/nbgitpuller/etc/nbgitpuller.json b/nbgitpuller/etc/jupyter_notebook_config.d/nbgitpuller.json
similarity index 100%
rename from nbgitpuller/etc/nbgitpuller.json
rename to nbgitpuller/etc/jupyter_notebook_config.d/nbgitpuller.json
diff --git a/nbgitpuller/etc/jupyter_server_config.d/nbgitpuller.json b/nbgitpuller/etc/jupyter_server_config.d/nbgitpuller.json
new file mode 100644
index 00000000..e3958472
--- /dev/null
+++ b/nbgitpuller/etc/jupyter_server_config.d/nbgitpuller.json
@@ -0,0 +1,8 @@
+{
+  "ServerApp": {
+    "jpserver_extensions": {
+      "nbgitpuller": true
+    }
+  }
+}
+
diff --git a/setup.py b/setup.py
index 2afcea0f..30e528d8 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,8 @@
     platforms='any',
     install_requires=['notebook>=5.5.0', 'tornado'],
     data_files=[
-        ('etc/jupyter/jupyter_notebook_config.d', ['nbgitpuller/etc/nbgitpuller.json'])
+        ('etc/jupyter/jupyter_server_config.d', ['nbgitpuller/etc/jupyter_server_config.d/nbgitpuller.json']),
+        ('etc/jupyter/jupyter_notebook_config.d', ['nbgitpuller/etc/jupyter_notebook_config.d/nbgitpuller.json'])
     ],
     zip_safe=False,
     entry_points={