Index: uspace/app/mkminix/mkminix.c
===================================================================
--- uspace/app/mkminix/mkminix.c	(revision 8ff0bd25c8215c84283f8ba039f4cb58b7660280)
+++ uspace/app/mkminix/mkminix.c	(revision 5e0427e81c3c2cc2b72f2a1e775d48424eae228e)
@@ -97,5 +97,5 @@
 static inline int write_block(aoff64_t off, size_t size, const void *data);
 
-static devmap_handle_t handle;
+static service_id_t service_id;
 static int shift;
 
@@ -201,5 +201,5 @@
 	}
 
-	rc = devmap_device_get_handle(device_name, &handle, 0);
+	rc = loc_service_get_id(device_name, &service_id, 0);
 	if (rc != EOK) {
 		printf(NAME ": Error resolving device `%s'.\n", device_name);
@@ -207,5 +207,5 @@
 	}
 
-	rc = block_init(EXCHANGE_SERIALIZE, handle, 2048);
+	rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
 	if (rc != EOK)  {
 		printf(NAME ": Error initializing libblock.\n");
@@ -213,5 +213,5 @@
 	}
 
-	rc = block_get_bsize(handle, &devblock_size);
+	rc = block_get_bsize(service_id, &devblock_size);
 	if (rc != EOK) {
 		printf(NAME ": Error determining device block size.\n");
@@ -219,5 +219,5 @@
 	}
 
-	rc = block_get_nblocks(handle, &sb.dev_nblocks);
+	rc = block_get_nblocks(service_id, &sb.dev_nblocks);
 	if (rc != EOK) {
 		printf(NAME ": Warning, failed to obtain block device size.\n");
@@ -271,4 +271,6 @@
 		return 2;
 	}
+
+	block_fini(service_id);
 
 	return 0;
@@ -600,5 +602,5 @@
 	sb->s_disk_version = 3;
 
-	rc = block_write_direct(handle, MFS_SUPERBLOCK << 1, 1 << 1, sb); 
+	rc = block_write_direct(service_id, MFS_SUPERBLOCK << 1, 1 << 1, sb);
 	free(sb);
 
@@ -690,5 +692,5 @@
 		uint8_t *data_ptr = (uint8_t *) data;
 
-		rc = block_write_direct(handle, tmp_off << 2, size << 2, data_ptr);
+		rc = block_write_direct(service_id, tmp_off << 2, size << 2, data_ptr);
 
 		if (rc != EOK)
@@ -698,7 +700,7 @@
 		tmp_off++;
 
-		return block_write_direct(handle, tmp_off << 2, size << 2, data_ptr);
-	}
-	return block_write_direct(handle, off << shift, size << shift, data);	
+		return block_write_direct(service_id, tmp_off << 2, size << 2, data_ptr);
+	}
+	return block_write_direct(service_id, off << shift, size << shift, data);
 }