diff --git a/Makefile.am b/Makefile.am
index 95e65bc..942a36b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,9 @@ cloud_init_SOURCES = \
 	src/lib.h \
 	src/main.c \
 	src/userdata.c \
-	src/userdata.h
+	src/userdata.h \
+	src/disk.c \
+	src/disk.h
 
 
 if DEBUG
@@ -54,8 +56,8 @@ AM_CFLAGS += -ggdb3 -O0
 cloud_init_SOURCES += src/debug.c
 endif
 
-cloud_init_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(YAML_CFLAGS) $(JSON_GLIB_CFLAGS) $(PARTED_CFLAGS)
-cloud_init_LDADD = $(GLIB_LIBS) $(YAML_LIBS) $(CURL_LIBS) $(JSON_GLIB_LIBS)  $(PARTED_LIBS)
+cloud_init_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(YAML_CFLAGS) $(JSON_GLIB_CFLAGS) $(PARTED_CFLAGS) $(BLKID_CFLAGS)
+cloud_init_LDADD = $(GLIB_LIBS) $(YAML_LIBS) $(CURL_LIBS) $(JSON_GLIB_LIBS) $(PARTED_LIBS) $(BLKID_LIBS)
 SYSTEMD_DIR=$(prefix)/lib/systemd/system/
 systemdsystemunitdir = @SYSTEMD_SYSTEMUNITDIR@
 systemdsystemunit_DATA = data/cloud-init.service
diff --git a/configure.ac b/configure.ac
index 302001d..d3feb24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,8 @@ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.24.1])
 PKG_CHECK_MODULES([YAML], [yaml-0.1 >= 0.1.4])
 PKG_CHECK_MODULES([CURL], [libcurl])
 PKG_CHECK_MODULES([JSON_GLIB], [json-glib-1.0])
-PKG_CHECK_MODULES([PARTED], [libparted = 3.2])
+PKG_CHECK_MODULES([PARTED], [libparted >= 3.2])
+PKG_CHECK_MODULES([BLKID], [blkid >= 2.25.0])
 
 # Checks for header files.
 AC_CHECK_HEADERS([errno.h])
diff --git a/src/disk.c b/src/disk.c
new file mode 100644
index 0000000..c7c680b
--- /dev/null
+++ b/src/disk.c
@@ -0,0 +1,192 @@
+/***
+ Copyright (C) 2015 Intel Corporation
+
+ Author: Julio Montes <julio.montes@intel.com>
+
+ This file is part of clr-cloud-init.
+
+ clr-cloud-init is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ clr-cloud-init is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with clr-cloud-init. If not, see <http://www.gnu.org/licenses/>.
+
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of portions of this program with the
+ OpenSSL library under certain conditions as described in each
+ individual source file, and distribute linked combinations
+ including the two.
+ You must obey the GNU General Public License in all respects
+ for all of the code used other than OpenSSL.  If you modify
+ file(s) with this exception, you may extend this exception to your
+ version of the file(s), but you are not obligated to do so.  If you
+ do not wish to do so, delete this exception statement from your
+ version.  If you delete this exception statement from all source
+ files in the program, then also delete it here.
+***/
+
+
+#include <sys/stat.h>
+
+#include <glib.h>
+#include <blkid.h>
+#include <parted/parted.h>
+
+#include "lib.h"
+
+#define MOD "disk: "
+
+static gboolean resize_fs;
+
+static PedExceptionOption disk_exception_handler(PedException* ex) {
+	const gchar* warning_message = "Not all of the space available";
+	LOG("Warning: %s\n", ex->message);
+	if (strncmp(ex->message, warning_message, strlen(warning_message)) == 0) {
+		if (PED_EXCEPTION_WARNING == ex->type && ex->options & PED_EXCEPTION_FIX) {
+			LOG("Handling warning, filesystem must be resized\n");
+			resize_fs = true;
+			return PED_EXCEPTION_FIX;
+		}
+	}
+	LOG("Warning was not handled\n");
+	return PED_EXCEPTION_UNHANDLED;
+}
+
+gchar *disk_for_path(const gchar* path) {
+	char diskname[NAME_MAX];
+    struct stat st = { 0 };
+    dev_t disk;
+
+    if (!path) {
+		LOG(MOD "Path is empty\n");
+        return NULL;
+    }
+    if (stat(path, &st) != 0) {
+		LOG(MOD "Cannot stat '%s'\n", path);
+        return NULL;
+    }
+    if (blkid_devno_to_wholedisk(st.st_dev, diskname, sizeof(diskname), &disk) != 0) {
+		LOG(MOD "Cannot convert devno to wholedisk\n");
+		return NULL;
+    }
+
+    return blkid_devno_to_devname(disk);
+}
+
+gboolean disk_resize_grow(const gchar* disk_path) {
+	char command[LINE_MAX] = { 0 };
+	int last_partition_num;
+	const gchar* partition_path;
+	PedDevice* dev = NULL;
+	PedDisk* disk = NULL;
+	gboolean result = false;
+	PedPartition* partition;
+	PedSector start;
+	PedSector end;
+	PedGeometry geometry_start;
+	PedGeometry* geometry_end;
+	PedConstraint* constraint;
+
+	resize_fs = false;
+
+	/* to handle exceptions, i.e Fix PMBR */
+	ped_exception_set_handler(disk_exception_handler);
+
+	if (!disk_path) {
+		LOG(MOD "Disk path is empty\n");
+		return false;
+	}
+
+	dev = ped_device_get(disk_path);
+
+	if (!dev) {
+		LOG(MOD "Cannot get device '%s'\n", disk_path);
+		return false;
+	}
+
+	/*
+	* verify disk, disk_exception_handler will called
+	* if the disk has problems and it needs to be fixed
+	* and resized
+	*/
+	disk = ped_disk_new(dev);
+
+	if (!disk) {
+		LOG(MOD "Cannot create a new disk '%s'\n", disk_path);
+		return false;
+	}
+
+	if (!resize_fs) {
+		/* do not resize filesystem, it is ok */
+		return true;
+	}
+
+	LOG(MOD "Resizing filesystem disk '%s'\n", disk_path);
+
+	last_partition_num = ped_disk_get_last_partition_num(disk);
+	partition = ped_disk_get_partition(disk, last_partition_num);
+
+	if (!partition) {
+		LOG(MOD "Cannot get partition '%d' disk '%s'\n", last_partition_num, disk_path);
+		return false;
+	}
+
+	start = partition->geom.start;
+	end = -1 * PED_MEGABYTE_SIZE / dev->sector_size + dev->length;
+
+	geometry_start.dev = dev;
+	geometry_start.start = start;
+	geometry_start.end = end;
+	geometry_start.length = 1;
+
+	geometry_end = ped_geometry_new(dev, end, 1);
+
+	if (!geometry_end) {
+		LOG(MOD "Cannot get partition '%d' disk '%s'\n", last_partition_num, disk_path);
+		return false;
+	}
+
+	constraint = ped_constraint_new(ped_alignment_any, ped_alignment_any, &geometry_start, geometry_end, 1, dev->length);
+
+	if (!constraint) {
+		LOG(MOD "Cannot create a new constraint disk '%s'\n", disk_path);
+		goto fail1;
+	}
+
+	if (!ped_disk_set_partition_geom(disk, partition, constraint, start, end)) {
+		LOG(MOD "Cannot set partition geometry disk '%s'\n", disk_path);
+		goto fail2;
+	}
+
+	if (!ped_disk_commit(disk)) {
+		LOG(MOD "Cannot write the partition table to disk '%s'\n", disk_path);
+		goto fail2;
+	}
+
+	partition_path = ped_partition_get_path(partition);
+
+	if (!partition_path) {
+		LOG(MOD "Cannot get partition path disk '%s'\n", disk_path);
+		goto fail2;
+	}
+
+	//FIXME using libparted algorithms
+	snprintf(command, LINE_MAX, "resize2fs %s", partition_path);
+	exec_task(command);
+
+	result = true;
+	LOG(MOD "Resizing filesystem done\n");
+
+fail2:
+	ped_constraint_destroy (constraint);
+fail1:
+	ped_geometry_destroy (geometry_end);
+	return result;
+}
diff --git a/src/disk.h b/src/disk.h
new file mode 100644
index 0000000..a247696
--- /dev/null
+++ b/src/disk.h
@@ -0,0 +1,40 @@
+/***
+ Copyright (C) 2015 Intel Corporation
+
+ Author: Julio Montes <julio.montes@intel.com>
+
+ This file is part of clr-cloud-init.
+
+ clr-cloud-init is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ clr-cloud-init is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with clr-cloud-init. If not, see <http://www.gnu.org/licenses/>.
+
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of portions of this program with the
+ OpenSSL library under certain conditions as described in each
+ individual source file, and distribute linked combinations
+ including the two.
+ You must obey the GNU General Public License in all respects
+ for all of the code used other than OpenSSL.  If you modify
+ file(s) with this exception, you may extend this exception to your
+ version of the file(s), but you are not obligated to do so.  If you
+ do not wish to do so, delete this exception statement from your
+ version.  If you delete this exception statement from all source
+ files in the program, then also delete it here.
+***/
+
+#include <glib.h>
+
+
+gchar *disk_for_path(const gchar* path);
+
+gboolean disk_resize_grow(const gchar* disk_path);