diff -Nru pymol-2.1.0+dfsg/debian/changelog pymol-2.1.0+dfsg/debian/changelog
--- pymol-2.1.0+dfsg/debian/changelog	2018-05-02 15:46:13.000000000 +0000
+++ pymol-2.1.0+dfsg/debian/changelog	2018-06-28 14:30:41.000000000 +0000
@@ -1,3 +1,10 @@
+pymol (2.1.0+dfsg-3) unstable; urgency=medium
+
+  * Team upload.
+  * Force use of Tk GUI to prevent crashes with Qt GUI (Closes: #902348).
+
+ -- Stuart Prescott <stuart@debian.org>  Fri, 29 Jun 2018 00:30:41 +1000
+
 pymol (2.1.0+dfsg-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru pymol-2.1.0+dfsg/debian/control pymol-2.1.0+dfsg/debian/control
--- pymol-2.1.0+dfsg/debian/control	2018-05-02 15:46:13.000000000 +0000
+++ pymol-2.1.0+dfsg/debian/control	2018-06-28 14:30:41.000000000 +0000
@@ -19,7 +19,6 @@
 Homepage: http://www.pymol.org
 Vcs-Browser: https://salsa.debian.org/debichem-team/pymol
 Vcs-Git: https://salsa.debian.org/debichem-team/pymol.git
-X-Python-Version: current
 
 Package: pymol
 Architecture: any
diff -Nru pymol-2.1.0+dfsg/debian/patches/50_force_tk.patch pymol-2.1.0+dfsg/debian/patches/50_force_tk.patch
--- pymol-2.1.0+dfsg/debian/patches/50_force_tk.patch	1970-01-01 00:00:00.000000000 +0000
+++ pymol-2.1.0+dfsg/debian/patches/50_force_tk.patch	2018-06-28 14:30:41.000000000 +0000
@@ -0,0 +1,24 @@
+Description: Disable the Qt interface to ensure the Tk interface is used.
+  Patch must be dropped when converting to the Qt interface.
+Author: Stuart Prescott <stuart@debian.org>
+Bug: 902348
+--- a/modules/pymol/__init__.py
++++ b/modules/pymol/__init__.py
+@@ -436,16 +436,7 @@
+         args = sys.argv
+     invocation.parse_args(args)
+ 
+-    if invocation.options.gui == 'pmg_qt':
+-        if invocation.options.no_gui:
+-            return _launch_no_gui()
+-
+-        try:
+-            from pmg_qt import pymol_qt_gui
+-            sys.exit(pymol_qt_gui.execapp())
+-        except ImportError:
+-            print('Qt not available, using GLUT/Tk interface')
+-            invocation.options.gui = 'pmg_tk'
++    invocation.options.gui = 'pmg_tk'
+ 
+     prime_pymol()
+     _cmd.runpymol(_cmd._get_global_C_object(), block_input_hook)
diff -Nru pymol-2.1.0+dfsg/debian/patches/series pymol-2.1.0+dfsg/debian/patches/series
--- pymol-2.1.0+dfsg/debian/patches/series	2018-05-02 15:46:13.000000000 +0000
+++ pymol-2.1.0+dfsg/debian/patches/series	2018-06-28 14:30:41.000000000 +0000
@@ -9,3 +9,4 @@
 33_fix_relative_paths_in_example_scripts.patch
 34_fix_examples_add_fetch_instead_of_load.patch
 40_mstop_movies.patch
+50_force_tk.patch
diff -Nru pymol-2.1.0+dfsg/debian/upstream/metadata pymol-2.1.0+dfsg/debian/upstream/metadata
--- pymol-2.1.0+dfsg/debian/upstream/metadata	2018-05-02 15:46:13.000000000 +0000
+++ pymol-2.1.0+dfsg/debian/upstream/metadata	2018-06-28 14:30:41.000000000 +0000
@@ -1,5 +1,13 @@
 Name: PyMOL
 Homepage: http://www.pymol.org
-Cite-As: "The PyMOL Molecular Graphics System, Version <Upstream-Version> Schrödinger, LLC."
+Cite-As: >
+ The PyMOL Molecular Graphics System, Version <Upstream-Version> Schrödinger, LLC.
 Repository: https://pymol.svn.sourceforge.net/svnroot/pymol/
 Repository-Browse: http://pymol.svn.sourceforge.net
+Registry:
+ - Name: OMICtools
+   Entry: OMICS_03802
+ - Name: SciCrunch
+   Entry: SCR_000305
+ - Name: bio.tools
+   Entry: PyMOL