diff --git a/common.py b/common.py
index 54b4182..7dac683 100644
--- a/common.py
+++ b/common.py
@@ -68,7 +68,7 @@ def prepareLaunchpadCookie():
         ftstr = ["FALSE", "TRUE"]
         
         # This shall be where our new cookie file lives - at ~/.lpcookie.txt
-        newLPCookieLocation = "%s/.lpcookie.txt" % os.environ.get('HOME')
+        newLPCookieLocation = os.path.expanduser("~/.lpcookie.txt")
         
         # Open file for writing.
         newLPCookie = open(newLPCookieLocation, 'w')
@@ -95,7 +95,7 @@ def prepareLaunchpadCookie():
         # only by owner.
         os.chmod(newLPCookieLocation, 0600)
         
-        launchpad_cookiefile = "%s/.lpcookie.txt" % os.environ.get('HOME')
+        launchpad_cookiefile = newLPCookieLocation
 
     # Return the Launchpad cookie.
     return launchpad_cookiefile
diff --git a/debian/changelog b/debian/changelog
index fb49496..0d58ec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ubuntu-dev-tools (0.39ubuntu1) intrepid; urgency=low
 
-  * Changes go here.
+  [ Jonathan Patrick Davies ]
+  * common.py: Use os.path.expanduser() instead of os.environ.
 
  -- Jonathan Patrick Davies <jpds@ubuntu.com>  Tue, 12 Aug 2008 18:32:05 +0100