diff --git a/var/spack/packages/dbus/package.py b/var/spack/packages/dbus/package.py
index 7f0019d67c..5fee103f03 100644
--- a/var/spack/packages/dbus/package.py
+++ b/var/spack/packages/dbus/package.py
@@ -1,25 +1,16 @@
-# 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 dbus
-#
-# You can always get back here to change things with:
-#
-#     spack edit dbus
-#
-# See the spack documentation for more information on building
-# packages.
-#
 from spack import *
 
 class Dbus(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"
+    """D-Bus is a message bus system, a simple way for applications to
+       talk to one another. D-Bus supplies both a system daemon (for
+       events such new hardware device printer queue ) and a
+       per-user-login-session daemon (for general IPC needs among user
+       applications). Also, the message bus is built on top of a
+       general one-to-one message passing framework, which can be used
+       by any two applications to communicate directly (without going
+       through the message bus daemon)."""
+
+    homepage = "http://dbus.freedesktop.org/"
     url      = "http://dbus.freedesktop.org/releases/dbus/dbus-1.8.8.tar.gz"
 
     version('1.9.0', 'ec6895a4d5c0637b01f0d0e7689e2b36')
@@ -28,13 +19,7 @@ class Dbus(Package):
     version('1.8.4', '4717cb8ab5b80978fcadf2b4f2f72e1b')
     version('1.8.2', 'd6f709bbec0a022a1847c7caec9d6068')
 
-    # FIXME: Add dependencies if this package requires them.
-    # depends_on("foo")
-
     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")
diff --git a/var/spack/packages/gnutls/package.py b/var/spack/packages/gnutls/package.py
new file mode 100644
index 0000000000..cf57a24a6d
--- /dev/null
+++ b/var/spack/packages/gnutls/package.py
@@ -0,0 +1,22 @@
+from spack import *
+
+class Gnutls(Package):
+    """GnuTLS is a secure communications library implementing the SSL,
+       TLS and DTLS protocols and technologies around them. It
+       provides a simple C language application programming interface
+       (API) to access the secure communications protocols as well as
+       APIs to parse and write X.509, PKCS #12, OpenPGP and other
+       required structures. It is aimed to be portable and efficient
+       with focus on security and interoperability."""
+
+    homepage = "http://www.gnutls.org"
+    url      = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-3.3.9.tar.xz"
+
+    version('3.3.9', 'ff61b77e39d09f1140ab5a9cf52c58b6')
+
+    depends_on("nettle")
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+        make()
+        make("install")
diff --git a/var/spack/packages/nettle/package.py b/var/spack/packages/nettle/package.py
new file mode 100644
index 0000000000..0f20bc06df
--- /dev/null
+++ b/var/spack/packages/nettle/package.py
@@ -0,0 +1,15 @@
+from spack import *
+
+class Nettle(Package):
+    """The Nettle package contains the low-level cryptographic library
+    that is designed to fit easily in many contexts."""
+
+    homepage = "http://www.example.com"
+    url      = "http://ftp.gnu.org/gnu/nettle/nettle-2.7.1.tar.gz"
+
+    version('2.7', '2caa1bd667c35db71becb93c5d89737f')
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+        make()
+        make("install")
diff --git a/var/spack/packages/qt/package.py b/var/spack/packages/qt/package.py
index aae9367a1b..fe0d4531c1 100644
--- a/var/spack/packages/qt/package.py
+++ b/var/spack/packages/qt/package.py
@@ -5,7 +5,7 @@ class Qt(Package):
     homepage = "http://qt.io"
 
     version('4.8.6', '2edbe4d6c2eff33ef91732602f3518eb',
-            "http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz")
+            url="http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz")
 
     # depends_on("zlib")
 
diff --git a/var/spack/packages/wget/package.py b/var/spack/packages/wget/package.py
new file mode 100644
index 0000000000..c8fd025122
--- /dev/null
+++ b/var/spack/packages/wget/package.py
@@ -0,0 +1,21 @@
+from spack import *
+
+class Wget(Package):
+    """GNU Wget is a free software package for retrieving files using
+       HTTP, HTTPS and FTP, the most widely-used Internet protocols. It
+       is a non-interactive commandline tool, so it may easily be called
+       from scripts, cron jobs, terminals without X-Windows support,
+       etc."""
+
+    homepage = "http://www.gnu.org/software/wget/"
+    url      = "http://ftp.gnu.org/gnu/wget/wget-1.16.tar.xz"
+
+    version('1.16', 'fe102975ab3a6c049777883f1bb9ad07')
+
+    depends_on("openssl")
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix,
+                  "--with-ssl=openssl")
+        make()
+        make("install")