diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py
index e496ffc3d1f4d3c5f67c4e633443d6825b0c8903..09eb05d5a76b7c735b5bae5d4286d7d7a9535fe4 100644
--- a/var/spack/repos/builtin/packages/emacs/package.py
+++ b/var/spack/repos/builtin/packages/emacs/package.py
@@ -1,36 +1,19 @@
-# FIXME:
-# This is a template package file for Spack.  We've conveniently
-# put "FIXME" labels next to all the things you'll want to change.
-#
-# Once you've edited all the FIXME's, delete this whole message,
-# save this file, and test out your package like this:
-#
-#     spack install emacs
-#
-# You can always get back here to change things with:
-#
-#     spack edit emacs
-#
-# See the spack documentation for more information on building
-# packages.
-#
 from spack import *
 
 class Emacs(Package):
-    """FIXME: put a proper description of your package here."""
-    # FIXME: add a proper url for your package's homepage here.
-    homepage = "http://www.example.com"
+    """The Emacs programmable text editor."""
+    homepage = "https://www.gnu.org/software/emacs"
     url      = "http://ftp.gnu.org/gnu/emacs/emacs-24.5.tar.gz"
 
     version('24.5', 'd74b597503a68105e61b5b9f6d065b44')
 
-    # FIXME: Add dependencies if this package requires them.
     depends_on('ncurses')
+    # Emacs also depends on:
+    #     GTK or other widget library
+    #     libtiff, png, etc.
+    # For now, we assume the system provides all that stuff.
 
     def install(self, spec, prefix):
-        # FIXME: Modify the configure line to suit your build system here.
         configure('--prefix=%s' % prefix)
-
-        # FIXME: Add logic to build and install here
         make()
         make("install")