diff --git a/debian/changelog b/debian/changelog
index 79293358..f2b02b79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ byobu (2.75) UNRELEASED; urgency=low
     with arguments, LP: #580760
   * ec2_cost, ip_address, network, rcs_cost: fix bug when calling ifconfig
     without setting lang to english, LP: #578792
-
+  * byobu-launcher-uninstall: create the directory, in case this script is
+    executed before byobu actually runs, LP: #580384
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Sat, 15 May 2010 15:32:30 -0400
 
diff --git a/usr/bin/byobu-launcher-uninstall b/usr/bin/byobu-launcher-uninstall
index 69aa9915..2113f5d3 100755
--- a/usr/bin/byobu-launcher-uninstall
+++ b/usr/bin/byobu-launcher-uninstall
@@ -31,6 +31,7 @@ remove_launcher() {
 for i in ".profile" ".bashrc" ".bash_profile" ".zprofile"; do
 	remove_launcher "$HOME/$i"
 done
+mkdir -p "$HOME/.$PKG"
 touch "$HOME/.$PKG/disable-autolaunch"
 # install disabled motd printing; re-enable
 rm -f "$HOME"/.hushlogin