diff --git a/ChangeLog b/ChangeLog
index dd3e87fa54bf5cefca9c4c2c6a0696f2582eacdd..60271d5bc8c8a7615ad8d212f553f0a44fe77ac7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-31, v0.4.4
+	* Fix a bug where the system tried to use file scrubbing without
+          checking if it was supported
+
 2013-07-18, v0.4.3
 	* Force TERM=linux when working on xterm. This makes dialog behave
 	  better under OpenSUSE
diff --git a/docs/conf.py b/docs/conf.py
index 86eeb36b818fb43f501b25fb2e7a343fb11b0ddc..0f38fb5442975f55e7db698a7d39f92ad9483a81 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,9 +50,9 @@ copyright = u'2012, 2013 GRNET S.A. All rights reserved'
 # built documents.
 #
 # The short X.Y version.
-version = '0.4.3'
+version = '0.4.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.3'
+release = '0.4.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/image_creator/os_type/__init__.py b/image_creator/os_type/__init__.py
index ec4f20dffcda845b1beade073d09441396cb9955..f3a33d94025d4b962df15aa724bf47a15205dfbe 100644
--- a/image_creator/os_type/__init__.py
+++ b/image_creator/os_type/__init__.py
@@ -85,6 +85,13 @@ class OSBase(object):
         self.out = output
         self.meta = {}
 
+        # Many guestfs compilations don't support scrub
+        self._scrub_support = True
+        try:
+            self.g.available(['scrub'])
+        except RuntimeError:
+            self._scrub_support = False
+
     def collect_metadata(self):
         """Collect metadata about the OS"""
         try:
diff --git a/image_creator/os_type/unix.py b/image_creator/os_type/unix.py
index 8b88b2fe60b92f1bdfaedd8080b44577cb5bca3a..001c90d70e7530bbdefb2e0cee38df738b9aaf25 100644
--- a/image_creator/os_type/unix.py
+++ b/image_creator/os_type/unix.py
@@ -139,12 +139,17 @@ class Unix(OSBase):
             self.out.output("Removing sensitive user data under %s" %
                             " ".join(homedirs))
 
+        action = self.g.rm_rf
+        if self._scrub_support:
+            action = self.g.scrub_file
+        else:
+            self.out.warn("Sensitive data won't be scrubbed (not supported)")
         for homedir in homedirs:
             for data in self.sensitive_userdata:
                 fname = "%s/%s" % (homedir, data)
                 if self.g.is_file(fname):
-                    self.g.scrub_file(fname)
+                    action(fname)
                 elif self.g.is_dir(fname):
-                    self._foreach_file(fname, self.g.scrub_file, ftype='r')
+                    self._foreach_file(fname, action, ftype='r')
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :
diff --git a/image_creator/version.py b/image_creator/version.py
index 62b2453637b9984061b00e565c5991e3a211854f..6e462d9a80d0f0982d5e3371ffa3b31c4a6961f5 100644
--- a/image_creator/version.py
+++ b/image_creator/version.py
@@ -1,8 +1,7 @@
-
-__version__ = "0.4.3"
+__version__ = "0.4.4"
+__version_info__ = ['0', '4', '4']
 __version_vcs_info__ = {
-    'branch': 'master',
-    'revid': '9f0e45e',
-    'revno': 319}
-__version_user_email__ = "skalkoto@grnet.gr"
-__version_user_name__ = "Nikos Skalkotos"
+    'branch': 'hotfix-0.4.4',
+    'revid': 'ce66ae3',
+    'revno': 322}
+__version_user_info__ = "skalkoto@darkstar.admin.grnet.gr"
diff --git a/version b/version
index 17b2ccd9bf9050efdf57d7800677e87919b9b5b9..6f2743d65dc06508954334e88edb660bf8efea20 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.4.3
+0.4.4