diff --git a/debian/changelog b/debian/changelog
index 9e1e51e..74d71b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ xen-tools (4.3~dev-1) UNRELEASED; urgency=low
     - Massive code deduplication in hooks directory
     - Use release blacklist for libc6-xen instead of whitelist in
       hooks/debian.d/20-setup-apt
+    - Enforces umask 022 in 50-setup-hostname* (Hopefully closes: #619630)
   * Add dependency on openssh-client for ssh-keygen (Closes: #649108)
   * Use dh_auto_test for build time tests and add according
     build-dependencies on devscripts and libfile-slurp-perl.
diff --git a/hooks/common/50-setup-hostname-deb b/hooks/common/50-setup-hostname-deb
index 5c89336..2ad57c4 100755
--- a/hooks/common/50-setup-hostname-deb
+++ b/hooks/common/50-setup-hostname-deb
@@ -33,6 +33,13 @@ logMessage Script $0 starting
 GUEST_FQDN=${hostname}
 GUEST_HOSTNAME=`echo $GUEST_FQDN | awk -F'.' '{print $1}'`
 
+
+#
+#  Make sure the umask is correct
+#
+umask 022
+
+
 #
 #  Setup the mailname + hostname files.
 #
diff --git a/hooks/common/50-setup-hostname-rpm b/hooks/common/50-setup-hostname-rpm
index 0d60567..e2ed19f 100755
--- a/hooks/common/50-setup-hostname-rpm
+++ b/hooks/common/50-setup-hostname-rpm
@@ -28,6 +28,12 @@ fi
 logMessage Script $0 starting
 
 
+#
+#  Make sure the umask is correct
+#
+umask 022
+
+
 #
 #  Setup the mailname + hostname files.
 #
diff --git a/hooks/gentoo/50-setup-hostname b/hooks/gentoo/50-setup-hostname
index ee05ba0..f721256 100755
--- a/hooks/gentoo/50-setup-hostname
+++ b/hooks/gentoo/50-setup-hostname
@@ -35,6 +35,12 @@ name=$(echo "$hostname" | sed -e 's/\..*$//')
 domain=$(echo "$hostname" | sed -e 's/^[^.]*\.//')
 
 
+#
+#  Make sure the umask is correct
+#
+umask 022
+
+
 #
 #  Setup the hostname + domain names.
 #