diff --git a/src/lib-sieve/plugins/vacation/cmd-vacation.c b/src/lib-sieve/plugins/vacation/cmd-vacation.c
index 5ee5257faee996853f5925591c3f3743ce9bb140..3779dc4edfefa9aea877daf29efd7401a70f8fe6 100644
--- a/src/lib-sieve/plugins/vacation/cmd-vacation.c
+++ b/src/lib-sieve/plugins/vacation/cmd-vacation.c
@@ -198,7 +198,7 @@ const struct sieve_action act_vacation = {
 struct act_vacation_context {
 	const char *reason;
 
-	sieve_size_t days;
+	sieve_number_t days;
 	const char *subject;
 	const char *handle;
 	bool mime;
@@ -542,7 +542,7 @@ static int ext_vacation_operation_execute
 	struct act_vacation_context *act;
 	pool_t pool;
 	int opt_code = 1;
-	sieve_size_t days = 7;
+	sieve_number_t days = 7;
 	bool mime = FALSE;
 	struct sieve_coded_stringlist *addresses = NULL;
 	string_t *reason, *subject = NULL, *from = NULL, *handle = NULL; 
diff --git a/src/lib-sieve/tst-size.c b/src/lib-sieve/tst-size.c
index 8ff7e355d9083ec039c53ee7a45e62b005784ab1..1a06fb61092b0a3ac239595ca55b340be7a1afcb 100644
--- a/src/lib-sieve/tst-size.c
+++ b/src/lib-sieve/tst-size.c
@@ -224,7 +224,7 @@ static bool tst_size_operation_dump
  */
 
 static inline bool tst_size_get
-(const struct sieve_runtime_env *renv, sieve_size_t *size) 
+(const struct sieve_runtime_env *renv, sieve_number_t *size) 
 {
 	uoff_t psize;
 
@@ -240,7 +240,7 @@ static int tst_size_operation_execute
 (const struct sieve_operation *op,
 	const struct sieve_runtime_env *renv, sieve_size_t *address)
 {
-	sieve_size_t mail_size, limit;
+	sieve_number_t mail_size, limit;
 		
 	/* Read size limit */
 	if ( !sieve_opr_number_read(renv, address, &limit) ) {
diff --git a/src/testsuite/tst-test-error.c b/src/testsuite/tst-test-error.c
index 607ceb7dbaf1c18ef1f9e4dc4ea7c854f6f87988..e7d23afe1ca380ac4f4746b8bb0e1c8ef782879e 100644
--- a/src/testsuite/tst-test-error.c
+++ b/src/testsuite/tst-test-error.c
@@ -229,7 +229,7 @@ static int tst_test_error_operation_execute
 
 	/* Handle optional operands */
 	do {
-		sieve_size_t number; 
+		sieve_number_t number; 
 
 		if ( (ret=sieve_match_read_optional_operands
 			(renv, address, &opt_code, &cmp, &mtch)) <= 0 )