diff --git a/var/spack/repos/builtin/packages/libmmtf-cpp/package.py b/var/spack/repos/builtin/packages/libmmtf-cpp/package.py
new file mode 100644
index 00000000000..039f1489aea
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libmmtf-cpp/package.py
@@ -0,0 +1,19 @@
+# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack import *
+
+
+class LibmmtfCpp(CMakePackage):
+    """The macromolecular transmission format (MMTF) is a binary encoding of
+    biological structures. This repository holds the C++-03 compatible API,
+    encoding and decoding libraries."""
+
+    homepage = "https://github.com/rcsb/mmtf-cpp"
+    url      = "https://github.com/rcsb/mmtf-cpp/archive/v1.0.0.tar.gz"
+
+    version('1.0.0', sha256='881f69c4bb56605fa63fd5ca50842facc4947f686cbf678ad04930674d714f40')
+
+    depends_on('msgpack-c')
diff --git a/var/spack/repos/builtin/packages/py-pymol/package.py b/var/spack/repos/builtin/packages/py-pymol/package.py
index c85f380d24f..53d9d6c712e 100644
--- a/var/spack/repos/builtin/packages/py-pymol/package.py
+++ b/var/spack/repos/builtin/packages/py-pymol/package.py
@@ -13,20 +13,19 @@ class PyPymol(PythonPackage):
        movies. Open Source PyMOL is free to everyone!"""
 
     homepage = "https://pymol.org"
-    url      = "https://sourceforge.net/projects/pymol/files/pymol/2/pymol-v2.1.0.tar.bz2"
+    url      = "https://github.com/schrodinger/pymol-open-source/archive/v2.3.0.tar.gz"
 
-    version('2.1.0', sha256='7ae8ebb899533d691a67c1ec731b00518dea456ab3e258aa052a65c24b63eae2')
+    version('2.3.0', sha256='62aa21fafd1db805c876f89466e47513809f8198395e1f00a5f5cc40d6f40ed0')
 
     depends_on('python+tkinter', type=('build', 'run'))
-    depends_on('tcl')
-    depends_on('tk')
-    depends_on('py-pmw')
-    depends_on('gl')
-    depends_on('glu')
+    depends_on('freetype', type=('build', 'run'))
     depends_on('glew')
-    depends_on('libpng')
-    depends_on('freetype')
-    depends_on('libxml2')
-    depends_on('msgpack-c')
-    depends_on('py-pyqt4', type=('build', 'run'))
-    depends_on('freeglut')
+    depends_on('glm')
+    depends_on('freeglut', type=('build', 'run'))
+    depends_on('py-numpy', type=('build', 'run'))
+    depends_on('tcsh', type=('build', 'run'))
+    depends_on('py-pyqt5', type=('build', 'run'))
+    depends_on('py-pmw', type=('build', 'run'))
+
+    depends_on('libmmtf-cpp', type=('build'))
+    depends_on('msgpack-c', type=('build'))