diff --git a/interpreter/cling/tools/packaging/cpt.py b/interpreter/cling/tools/packaging/cpt.py
index 82707033015b2..543bc31cee21b 100755
--- a/interpreter/cling/tools/packaging/cpt.py
+++ b/interpreter/cling/tools/packaging/cpt.py
@@ -1576,6 +1576,14 @@ def make_dmg():
         build_nsis()
         cleanup()
 
+    elif args['last_stable'] == 'dmg':
+        set_version()
+        compile(os.path.join(workdir, 'cling-' + DIST + '-' + REV + '-' + platform.machine().lower() + '-' + VERSION))
+        install_prefix()
+        test_cling()
+        make_dmg()
+        cleanup()
+
 if args['tarball_tag']:
     fetch_llvm()
     fetch_clang()
@@ -1633,6 +1641,17 @@ def make_dmg():
     build_nsis()
     cleanup()
 
+if args['dmg_tag']:
+    fetch_llvm()
+    fetch_clang()
+    fetch_cling(args['dmg_tag'])
+    set_version()
+    compile(os.path.join(workdir, 'cling-' + DIST + '-' + REV + '-' + platform.machine().lower() + '-' + VERSION))
+    install_prefix()
+    test_cling()
+    make_dmg()
+    cleanup()
+
 if args['make_proper']:
     # This is an internal option in CPT, meant to be integrated into Cling's build system.
     with open(os.path.join(LLVM_OBJ_ROOT, 'config.log'), 'r') as log: