diff --git a/setup.py b/setup.py
index 137c7ef..c22c1d8 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ def load_about():
 
 setup(
     name="tutor-jupyter",
-    version=ABOUT["__package_version__"],
+    version=ABOUT["__version__"],
     url="https://github.com/overhangio/tutor-jupyter",
     project_urls={
         "Code": "https://github.com/overhangio/tutor-jupyter",
diff --git a/tutorjupyter/__about__.py b/tutorjupyter/__about__.py
index 55dd216..d945113 100644
--- a/tutorjupyter/__about__.py
+++ b/tutorjupyter/__about__.py
@@ -1,8 +1,2 @@
 __version__ = "16.0.1"
-__package_version__ = __version__
 
-# Handle version suffix for nightly, just like tutor core.
-__version_suffix__ = "nightly"
-
-if __version_suffix__:
-    __version__ += "-" + __version_suffix__
diff --git a/tutorjupyter/plugin.py b/tutorjupyter/plugin.py
index 4e7674c..08c23c5 100644
--- a/tutorjupyter/plugin.py
+++ b/tutorjupyter/plugin.py
@@ -8,9 +8,14 @@
 
 import pkg_resources
 from tutor import hooks
+from tutor.__about__ import __version_suffix__
 
 from .__about__ import __version__
 
+# Handle version suffix in nightly mode, just like tutor core
+if __version_suffix__:
+    __version__ += "-" + __version_suffix__
+
 ########################################
 # CONFIGURATION
 ########################################