diff --git a/packages/nest/package.py b/packages/nest/package.py
index 302c2aaaf62bc001794a01c7dc062e5b57da32ae..24b89a633a3e6f16d4cfb645bc9bde381e45057f 100644
--- a/packages/nest/package.py
+++ b/packages/nest/package.py
@@ -20,12 +20,15 @@ class Nest(CMakePackage):
     git      = "https://github.com/nest/nest-simulator.git"
 
     version('master', branch='master')
+    version('3.1',    sha256='5c11dd6b451c4c6bf93037bf29d5231c6c75a0e1a8863344f6fb9bb225f279ca')
     version('3.0',    sha256='d481ea67f3251fe3aadf5252ab0a999172f0cd5536c5985366d271d772e686e6')
     patch('2021-07-17_fix-pyexecdir.patch', when='@3.0')
+    version('2.20.2', sha256='7c36daf673b379b8ef82d2293a4cdf2f4dbb5d25bf570cf52f41f6293c89a28d')
     version('2.20.1', sha256='df3d32b5899d5d444f708037b290f889ac6ff8eae6b7be9e9faee2c0d660d8e5')
     version('2.20.0', sha256='40e33187c22d6e843d80095b221fa7fd5ebe4dbc0116765a91fc5c425dd0eca4', deprecated=True)
-    version('2.18.0', sha256='7295c936fbdd5486395b06f54f0d4d35d9a1b6ee50b7b844186ec2c92de641d1')
-    version('2.16.0', sha256='abfeb61719dec54da9477be035bef1d9d764f4e7663f63f6a6d9211f967e0490')
+    version('2.18.0', sha256='7295c936fbdd5486395b06f54f0d4d35d9a1b6ee50b7b844186ec2c92de641d1', deprecated=True)
+    version('2.16.0', sha256='abfeb61719dec54da9477be035bef1d9d764f4e7663f63f6a6d9211f967e0490', deprecated=True)
+    version('2.14.1', sha256='23aeadd0b8eda83a31797751f96855b0208979d70472e0f6752a7ce7ea80ad7a')
     version('2.14.0', sha256='d6316d6c9153100a3220488abfa738958c4b65bf2622bd15540e4aa81e79f17f')
     version('2.12.0', sha256='bac578f38bb0621618ee9d5f2f1febfee60cddc000ff32e51a5f5470bb3df40d')
     version('2.10.0', sha256='2b6fc562cd6362e812d94bb742562a5a685fb1c7e08403765dbe123d59b0996c')
diff --git a/packages/py-pynn/package.py b/packages/py-pynn/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..914d6c932e7d70530cd47478aa4b3fe9a649d322
--- /dev/null
+++ b/packages/py-pynn/package.py
@@ -0,0 +1,36 @@
+# Copyright 2013-2021 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 PyPynn(PythonPackage):
+    """A Python package for simulator-independent specification of neuronal
+        network models
+    """
+
+    homepage = "http://neuralensemble.org/PyNN/"
+    pypi = "PyNN/PyNN-0.8.3.tar.gz"
+    git      = "https://github.com/NeuralEnsemble/PyNN.git"
+
+    version('0.9.5', sha256='91af2126b639a6a795bfc2709ac49423278c4794b6d0da143908b9afcb415f80')
+    version('0.9.1', sha256='bbc60fea3235427191feb2daa0e2fa07eb1c3946104c068ac8a2a0501263b0b1')
+    version('0.8.3', sha256='9d59e6cffa4714f0c892ec6b32d1f5f8f75ba3a20d8635bac50c047aa6f2537e')
+    version('0.8beta', commit='ffb0cb1661f2b0f2778db8f71865978fe7a7a6a4')
+    version('0.8.1', sha256='ce94246284588414d1570c1d5d697805f781384e771816727c830b01ee30fe39')
+    version('0.7.5', sha256='15f75f422f3b71c6129ecef23f29d8baeb3ed6502e7a321b8a2596c78ef7e03c')
+
+    depends_on('python@2.6:2.8,3.3:')
+    depends_on('py-jinja2@2.7:',        type=('build', 'run'))
+    depends_on('py-docutils@0.10:',     type=('build', 'run'))
+    depends_on('py-numpy@1.5:',         type=('build', 'run'))
+    depends_on('py-quantities@0.10:',   type=('build', 'run'))
+    depends_on('py-lazyarray@0.2.9:',   type=('build', 'run'))
+
+    depends_on('py-neo@0.3:0.4.1',      type=('build', 'run'), when="@:0.8.3")
+    depends_on('py-neo@0.5.0:',         type=('build', 'run'), when="@0.9.0:")
+    depends_on('py-lazyarray',          type=('build', 'run'), when="@0.9.0:")
+
+    depends_on('py-mock@1.0:', type='test')
diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py
index 4f9c40a283ad05c39ad616933dad77c9e3e360d1..e739fd808cd71861a3683d7f4001f03aec371c60 100644
--- a/packages/pynn-brainscales/package.py
+++ b/packages/pynn-brainscales/package.py
@@ -57,6 +57,9 @@ class PynnBrainscales(WafPackage):
         env.set('LD_LIBRARY_PATH', ':'.join(library))
         env.prepend_path('PATH', ':'.join(path))
 
+    def setup_run_environment(self, env):
+        env.prepend_path('PYTHONPATH', self.prefix.lib)
+
     # override configure step as we perform a project setup first
     def configure(self, spec, prefix):
         """Setup and configure the project."""