diff --git a/var/spack/repos/builtin/packages/coreutils/package.py b/var/spack/repos/builtin/packages/coreutils/package.py
index 4aa938a43436825ff6a04e9159c5fb7a64684909..5743bfdc577573bfaf4a44a7ee71ca7558e689ef 100644
--- a/var/spack/repos/builtin/packages/coreutils/package.py
+++ b/var/spack/repos/builtin/packages/coreutils/package.py
@@ -12,8 +12,9 @@ class Coreutils(AutotoolsPackage, GNUMirrorPackage):
        the core utilities which are expected to exist on every
        operating system.
     """
-    homepage = "http://www.gnu.org/software/coreutils/"
-    gnu_mirror_path = "coreutils/coreutils-8.26.tar.xz"
+
+    homepage = 'http://www.gnu.org/software/coreutils/'
+    gnu_mirror_path = 'coreutils/coreutils-8.26.tar.xz'
 
     version('8.31', sha256='ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd')
     version('8.30', sha256='e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057')
@@ -22,3 +23,14 @@ class Coreutils(AutotoolsPackage, GNUMirrorPackage):
     version('8.23', sha256='ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d')
 
     build_directory = 'spack-build'
+
+    def configure_args(self):
+        spec = self.spec
+        configure_args = []
+        if spec.satisfies('platform=darwin'):
+            configure_args.append('--program-prefix=g')
+            configure_args.append('--without-gmp')
+            configure_args.append('gl_cv_func_ftello_works=yes')
+            configure_args.append('FORCE_UNSAFE_CONFIGURE=1')
+
+            return configure_args
diff --git a/var/spack/repos/builtin/packages/nano/package.py b/var/spack/repos/builtin/packages/nano/package.py
index 0901db0a05c184bbfb3faefe943ae6101afddf7c..9fce06f9299f0396b140469b303ce4b7008ab381 100644
--- a/var/spack/repos/builtin/packages/nano/package.py
+++ b/var/spack/repos/builtin/packages/nano/package.py
@@ -10,11 +10,16 @@ class Nano(AutotoolsPackage):
     """Tiny little text editor"""
 
     homepage = "http://www.nano-editor.org"
-    url      = "https://www.nano-editor.org/dist/v4/nano-4.4.tar.xz"
+    url      = "https://www.nano-editor.org/dist/v4/nano-4.9.tar.xz"
     list_url = "https://www.nano-editor.org/dist/"
     list_depth = 1
 
     # 4.x
+    version('4.9', sha256='0e399729d105cb1a587b4140db5cf1b23215a0886a42b215efa98137164233a6')
+    version('4.8', sha256='c348f61c68ab1d573b308398212a09cd68c60fbee20f01a5bd4b50071a258e63')
+    version('4.7', sha256='58c0e197de5339ca3cad3ef42b65626d612ddb0b270e730f02e6ab3785c736f5')
+    version('4.6', sha256='9bac3a4153774fd921dd3eb291986d43985466b081165b5ac5262b37b79628e9')
+    version('4.5', sha256='ded5c38f5ecd9de2b624e0db8013a375c169d3fbbd49575967b868847df8f533')
     version('4.4', sha256='2af222e0354848ffaa3af31b5cd0a77917e9cb7742cd073d762f3c32f0f582c7')
     version('4.3', sha256='00d3ad1a287a85b4bf83e5f06cedd0a9f880413682bebd52b4b1e2af8cfc0d81')
     version('4.2', sha256='1143defce62e391b241252ffdb6e5c1ded56cfe26d46ee81b796abe0ccc45df9')