diff --git a/configure.in b/configure.in
index 5d99e296daceb1bb6cdda7d1087555414cb88b4b..4c6cf3bd5110075e67a7eb35f40701f67d1e8743 100644
--- a/configure.in
+++ b/configure.in
@@ -60,6 +60,7 @@ src/Makefile
 src/lib-sieve/Makefile
 src/lib-sieve/plugins/Makefile
 src/lib-sieve/plugins/vacation/Makefile
+src/sieve-bin/Makefile
 stamp.h])
 
 AC_OUTPUT
diff --git a/src/lib-sieve/scripts/errors/address-errors.sieve b/sieve/errors/address-errors.sieve
similarity index 100%
rename from src/lib-sieve/scripts/errors/address-errors.sieve
rename to sieve/errors/address-errors.sieve
diff --git a/src/lib-sieve/scripts/errors/header-errors.sieve b/sieve/errors/header-errors.sieve
similarity index 100%
rename from src/lib-sieve/scripts/errors/header-errors.sieve
rename to sieve/errors/header-errors.sieve
diff --git a/src/lib-sieve/scripts/errors/if-errors.sieve b/sieve/errors/if-errors.sieve
similarity index 100%
rename from src/lib-sieve/scripts/errors/if-errors.sieve
rename to sieve/errors/if-errors.sieve
diff --git a/src/lib-sieve/scripts/errors/interesting.sieve b/sieve/errors/interesting.sieve
similarity index 100%
rename from src/lib-sieve/scripts/errors/interesting.sieve
rename to sieve/errors/interesting.sieve
diff --git a/src/lib-sieve/scripts/errors/keep-errors.sieve b/sieve/errors/keep-errors.sieve
similarity index 100%
rename from src/lib-sieve/scripts/errors/keep-errors.sieve
rename to sieve/errors/keep-errors.sieve
diff --git a/src/lib-sieve/scripts/errors/parse-errors.sieve b/sieve/errors/parse-errors.sieve
similarity index 100%
rename from src/lib-sieve/scripts/errors/parse-errors.sieve
rename to sieve/errors/parse-errors.sieve
diff --git a/src/lib-sieve/scripts/errors/require-errors.sieve b/sieve/errors/require-errors.sieve
similarity index 100%
rename from src/lib-sieve/scripts/errors/require-errors.sieve
rename to sieve/errors/require-errors.sieve
diff --git a/src/lib-sieve/scripts/errors/size-errors.sieve b/sieve/errors/size-errors.sieve
similarity index 100%
rename from src/lib-sieve/scripts/errors/size-errors.sieve
rename to sieve/errors/size-errors.sieve
diff --git a/src/lib-sieve/scripts/errors/stop-errors.sieve b/sieve/errors/stop-errors.sieve
similarity index 100%
rename from src/lib-sieve/scripts/errors/stop-errors.sieve
rename to sieve/errors/stop-errors.sieve
diff --git a/src/lib-sieve/scripts/errors/tag-errors.sieve b/sieve/errors/tag-errors.sieve
similarity index 100%
rename from src/lib-sieve/scripts/errors/tag-errors.sieve
rename to sieve/errors/tag-errors.sieve
diff --git a/src/lib-sieve/scripts/examples/elvey.sieve b/sieve/examples/elvey.sieve
similarity index 100%
rename from src/lib-sieve/scripts/examples/elvey.sieve
rename to sieve/examples/elvey.sieve
diff --git a/src/lib-sieve/scripts/examples/mjohnson.sieve b/sieve/examples/mjohnson.sieve
similarity index 100%
rename from src/lib-sieve/scripts/examples/mjohnson.sieve
rename to sieve/examples/mjohnson.sieve
diff --git a/src/lib-sieve/scripts/examples/mklose.sieve b/sieve/examples/mklose.sieve
similarity index 100%
rename from src/lib-sieve/scripts/examples/mklose.sieve
rename to sieve/examples/mklose.sieve
diff --git a/src/lib-sieve/scripts/examples/rfc3028.sieve b/sieve/examples/rfc3028.sieve
similarity index 100%
rename from src/lib-sieve/scripts/examples/rfc3028.sieve
rename to sieve/examples/rfc3028.sieve
diff --git a/src/lib-sieve/scripts/examples/sanjay.sieve b/sieve/examples/sanjay.sieve
similarity index 100%
rename from src/lib-sieve/scripts/examples/sanjay.sieve
rename to sieve/examples/sanjay.sieve
diff --git a/src/lib-sieve/scripts/examples/sieve_examples.sieve b/sieve/examples/sieve_examples.sieve
similarity index 100%
rename from src/lib-sieve/scripts/examples/sieve_examples.sieve
rename to sieve/examples/sieve_examples.sieve
diff --git a/src/lib-sieve/scripts/examples/stephan.sieve b/sieve/examples/stephan.sieve
similarity index 100%
rename from src/lib-sieve/scripts/examples/stephan.sieve
rename to sieve/examples/stephan.sieve
diff --git a/src/lib-sieve/scripts/examples/unparsed-elvey.sieve b/sieve/examples/unparsed-elvey.sieve
similarity index 100%
rename from src/lib-sieve/scripts/examples/unparsed-elvey.sieve
rename to sieve/examples/unparsed-elvey.sieve
diff --git a/src/lib-sieve/scripts/examples/vacation.sieve b/sieve/examples/vacation.sieve
similarity index 100%
rename from src/lib-sieve/scripts/examples/vacation.sieve
rename to sieve/examples/vacation.sieve
diff --git a/src/lib-sieve/scripts/examples/vivil.sieve b/sieve/examples/vivil.sieve
similarity index 100%
rename from src/lib-sieve/scripts/examples/vivil.sieve
rename to sieve/examples/vivil.sieve
diff --git a/sieve/tests/basic.sieve b/sieve/tests/basic.sieve
new file mode 100644
index 0000000000000000000000000000000000000000..5ee7bc2dcc1671df1f969ab2c03782f475cfce59
--- /dev/null
+++ b/sieve/tests/basic.sieve
@@ -0,0 +1,7 @@
+if false {	
+  keep;
+} elsif false {
+  stop;
+} else {
+  discard;
+}
diff --git a/src/lib-sieve/scripts/tests/extensions.sieve b/sieve/tests/extensions.sieve
similarity index 100%
rename from src/lib-sieve/scripts/tests/extensions.sieve
rename to sieve/tests/extensions.sieve
diff --git a/src/lib-sieve/scripts/tests/if.sieve b/sieve/tests/if.sieve
similarity index 100%
rename from src/lib-sieve/scripts/tests/if.sieve
rename to sieve/tests/if.sieve
diff --git a/src/Makefile.am b/src/Makefile.am
index 105c9c593d5f583d2efe0d4a295c87125a14fa1d..2a33151c1892b5d0c79615f7d21378b9b33cbd05 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1 @@
-SUBDIRS = lib-sieve
+SUBDIRS = lib-sieve sieve-bin
diff --git a/src/lib-sieve/Makefile.am b/src/lib-sieve/Makefile.am
index 7c875d98405caeb054fb2a5513511afffb1f3eb5..78c2a189deb975ea50d49c4f72152946fc8d1f26 100644
--- a/src/lib-sieve/Makefile.am
+++ b/src/lib-sieve/Makefile.am
@@ -1,8 +1,6 @@
-#noinst_LTLIBRARIES = libsieve-dovecot.la
-
 SUBDIRS = plugins
 
-sbin_PROGRAMS = sievec
+noinst_LIBRARIES = libsieve.a
 
 AM_CPPFLAGS = \
 	-I$(dovecot_incdir) \
@@ -10,10 +8,6 @@ AM_CPPFLAGS = \
 	-I$(dovecot_incdir)/src/lib-mail \
 	-I$(dovecot_incdir)/src/lib-storage 
 
-sievec_LDADD = \
-	${dovecot_incdir}/src/lib/liblib.a \
-	./plugins/vacation/lib_ext_vacation.a
-
 tsts = \
 	tst-not.c \
 	tst-anyof.c \
@@ -33,7 +27,7 @@ exts = \
 	ext-reject.c \
 	ext-envelope.c
 
-sievec_SOURCES = \
+libsieve_a_SOURCES = \
 	sieve-lexer.c \
 	sieve-ast.c \
 	sieve-binary.c \
@@ -48,8 +42,7 @@ sievec_SOURCES = \
 	$(tsts) \
 	$(cmds) \
 	sieve-extensions.c \
-	$(exts) \
-	sievec.c 
+	$(exts) 
 
 noinst_HEADERS = \
 	sieve-lexer.h \
diff --git a/src/lib-sieve/sieve-code.c b/src/lib-sieve/sieve-code.c
index a7873c48d41e3eb6c2b2db95140c8e91487fb6f0..6c71bf80268cccac21d2eadab8c684c608d9818d 100644
--- a/src/lib-sieve/sieve-code.c
+++ b/src/lib-sieve/sieve-code.c
@@ -3,123 +3,141 @@
 #include "sieve-code.h"
 #include "sieve-interpreter.h"
 
-extern bool sieve_code_dump_jmp(struct sieve_interpreter *interpreter);
-extern bool sieve_code_dump_jmptrue(struct sieve_interpreter *interpreter);
-extern bool sieve_code_dump_jmpfalse(struct sieve_interpreter *interpreter);
-extern bool sieve_code_dump_stop(struct sieve_interpreter *interpreter);
-extern bool sieve_code_dump_keep(struct sieve_interpreter *interpreter);
-extern bool sieve_code_dump_discard(struct sieve_interpreter *interpreter);
-extern bool sieve_code_dump_address(struct sieve_interpreter *interpreter);
-extern bool sieve_code_dump_header(struct sieve_interpreter *interpreter);
-extern bool sieve_code_dump_exists(struct sieve_interpreter *interpreter);
-extern bool sieve_code_dump_sizeover(struct sieve_interpreter *interpreter);
-extern bool sieve_code_dump_sizeunder(struct sieve_interpreter *interpreter);
-
-const struct sieve_opcode sieve_opcodes[] = {
-  { sieve_code_dump_jmp, NULL },
-  { sieve_code_dump_jmptrue, NULL },
-  { sieve_code_dump_jmpfalse, NULL },
-  { sieve_code_dump_stop, NULL },
-  { sieve_code_dump_keep, NULL },
-  { sieve_code_dump_discard, NULL },
-  { sieve_code_dump_address, NULL },
-  { sieve_code_dump_header, NULL },
-  { sieve_code_dump_exists, NULL },
-  { sieve_code_dump_sizeover, NULL },
-  { sieve_code_dump_sizeunder, NULL }
+static bool sieve_code_dump_jmp(struct sieve_interpreter *interpreter);
+static bool sieve_code_dump_jmptrue(struct sieve_interpreter *interpreter);
+static bool sieve_code_dump_jmpfalse(struct sieve_interpreter *interpreter);
+static bool sieve_code_dump_stop(struct sieve_interpreter *interpreter);
+static bool sieve_code_dump_keep(struct sieve_interpreter *interpreter);
+static bool sieve_code_dump_discard(struct sieve_interpreter *interpreter);
+
+static bool sieve_code_execute_jmp(struct sieve_interpreter *interpreter);
+static bool sieve_code_execute_jmptrue(struct sieve_interpreter *interpreter);
+static bool sieve_code_execute_jmpfalse(struct sieve_interpreter *interpreter);
+static bool sieve_code_execute_stop(struct sieve_interpreter *interpreter);
+static bool sieve_code_execute_keep(struct sieve_interpreter *interpreter);
+static bool sieve_code_execute_discard(struct sieve_interpreter *interpreter);
+
+const struct sieve_opcode sieve_opcode_jmp = { sieve_code_dump_jmp, sieve_code_execute_jmp };
+const struct sieve_opcode sieve_opcode_jmptrue = { sieve_code_dump_jmptrue, sieve_code_execute_jmptrue };
+const struct sieve_opcode sieve_opcode_jmpfalse = { sieve_code_dump_jmpfalse, sieve_code_execute_jmpfalse };
+const struct sieve_opcode sieve_opcode_stop = { sieve_code_dump_stop, sieve_code_execute_stop };
+const struct sieve_opcode sieve_opcode_keep = { sieve_code_dump_keep, sieve_code_execute_keep };
+const struct sieve_opcode sieve_opcode_discard = { sieve_code_dump_discard, sieve_code_execute_discard };
+
+extern const struct sieve_opcode tst_address_opcode;
+extern const struct sieve_opcode tst_header_opcode;
+extern const struct sieve_opcode tst_exists_opcode;
+extern const struct sieve_opcode tst_size_over_opcode;
+extern const struct sieve_opcode tst_size_under_opcode;
+
+const struct sieve_opcode *sieve_opcodes[] = {
+  &sieve_opcode_jmp,
+  &sieve_opcode_jmptrue, 
+  &sieve_opcode_jmpfalse,
+  &sieve_opcode_stop,
+  &sieve_opcode_keep,
+  &sieve_opcode_discard,
+
+  &tst_address_opcode,
+  &tst_header_opcode,
+  &tst_exists_opcode,
+  &tst_size_over_opcode,
+  &tst_size_under_opcode
 }; 
 
 /* Code dump for core commands */
 
-bool sieve_code_dump_jmp(struct sieve_interpreter *interpreter)
+static bool sieve_code_dump_jmp(struct sieve_interpreter *interpreter)
 {
 	unsigned int pc = sieve_interpreter_program_counter(interpreter);
 	int offset = sieve_interpreter_read_offset(interpreter);
 	
-	printf("JMP %d [%08x]\n", offset, pc + 1 + offset);
+	printf("JMP %d [%08x]\n", offset, pc + offset);
 	
 	return TRUE;
 }	
 		
-bool sieve_code_dump_jmptrue(struct sieve_interpreter *interpreter)
+static bool sieve_code_dump_jmptrue(struct sieve_interpreter *interpreter)
 {	
 	unsigned int pc = sieve_interpreter_program_counter(interpreter);
 	int offset = sieve_interpreter_read_offset(interpreter);
 		
-	printf("JMPTRUE %d [%08x]\n", offset, pc + 1 + offset);
+	printf("JMPTRUE %d [%08x]\n", offset, pc + offset);
 	
 	return TRUE;
 }
 
-bool sieve_code_dump_jmpfalse(struct sieve_interpreter *interpreter)
+static bool sieve_code_dump_jmpfalse(struct sieve_interpreter *interpreter)
 {	
 	unsigned int pc = sieve_interpreter_program_counter(interpreter);
 	int offset = sieve_interpreter_read_offset(interpreter);
 	
-	printf("JMPFALSE %d [%08x]\n", offset, pc + 1 + offset);
+	printf("JMPFALSE %d [%08x]\n", offset, pc + offset);
 	
 	return TRUE;
 }	
 	
-bool sieve_code_dump_stop(struct sieve_interpreter *interpreter __attr_unused__)
+static bool sieve_code_dump_stop(struct sieve_interpreter *interpreter __attr_unused__)
 {	
 	printf("STOP\n");
 	
 	return TRUE;
 }
 
-bool sieve_code_dump_keep(struct sieve_interpreter *interpreter __attr_unused__)
+static bool sieve_code_dump_keep(struct sieve_interpreter *interpreter __attr_unused__)
 {	
 	printf("KEEP\n");
 	
 	return TRUE;
 }
 
-bool sieve_code_dump_discard(struct sieve_interpreter *interpreter __attr_unused__)
+static bool sieve_code_dump_discard(struct sieve_interpreter *interpreter __attr_unused__)
 {	
 	printf("DISCARD\n");
 	
 	return TRUE;
 }
 
-bool sieve_code_dump_address(struct sieve_interpreter *interpreter)
-{	
-	printf("ADDRESS\n");
-	sieve_interpreter_dump_operand(interpreter);
-	sieve_interpreter_dump_operand(interpreter);
+/* Code execution for core commands */
+
+static bool sieve_code_execute_jmp(struct sieve_interpreter *interpreter)
+{
+	sieve_interpreter_program_jump(interpreter);
 	
 	return TRUE;
-}
-
-bool sieve_code_dump_header(struct sieve_interpreter *interpreter)
+}	
+		
+static bool sieve_code_execute_jmptrue(struct sieve_interpreter *interpreter)
 {	
-	printf("HEADER\n");
-	sieve_interpreter_dump_operand(interpreter);
-	sieve_interpreter_dump_operand(interpreter);
+	sieve_interpreter_program_jump(interpreter);
 	
 	return TRUE;
 }
 
-bool sieve_code_dump_exists(struct sieve_interpreter *interpreter)
+static bool sieve_code_execute_jmpfalse(struct sieve_interpreter *interpreter)
 {	
-	printf("EXISTS\n");
-	sieve_interpreter_dump_operand(interpreter);
+	sieve_interpreter_program_jump(interpreter);
 	
 	return TRUE;
+}	
+	
+static bool sieve_code_execute_stop(struct sieve_interpreter *interpreter __attr_unused__)
+{	
+	printf(">> STOP\n");
+	
+	return FALSE;
 }
 
-bool sieve_code_dump_sizeover(struct sieve_interpreter *interpreter)
+static bool sieve_code_execute_keep(struct sieve_interpreter *interpreter __attr_unused__)
 {	
-	printf("SIZEOVER\n");
-	sieve_interpreter_dump_operand(interpreter);
+	printf(">> KEEP\n");
 	
 	return TRUE;
 }
 
-bool sieve_code_dump_sizeunder(struct sieve_interpreter *interpreter)
+static bool sieve_code_execute_discard(struct sieve_interpreter *interpreter __attr_unused__)
 {	
-	printf("SIZEUNDER\n");
-	sieve_interpreter_dump_operand(interpreter);
+	printf(">> DISCARD\n");
 	
 	return TRUE;
 }
diff --git a/src/lib-sieve/sieve-code.h b/src/lib-sieve/sieve-code.h
index ec2bd1a9557cc05296819883584ea325f80f90cc..3af305ba098c2d8d671e510a593d88061da5a977 100644
--- a/src/lib-sieve/sieve-code.h
+++ b/src/lib-sieve/sieve-code.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_CODE_H__
-#define __SIEVE_CODE_H__
+#ifndef __SIEVE_CODE_H
+#define __SIEVE_CODE_H
 
 #include <lib.h>
 #include <buffer.h>
@@ -28,7 +28,7 @@ enum sieve_core_operation {
 	SIEVE_OPCODE_SIZEUNDER
 };
 
-extern const struct sieve_opcode sieve_opcodes[];
+extern const struct sieve_opcode *sieve_opcodes[];
 
 enum sieve_core_operand {
   SIEVE_OPERAND_NUMBER       = 0x01,
diff --git a/src/lib-sieve/sieve-interpreter.c b/src/lib-sieve/sieve-interpreter.c
index 322bfe647fe044b2106c2dc217e5298f8c37980e..65367437e7c23fe2c5e7fc0f78c701af5c47f2f4 100644
--- a/src/lib-sieve/sieve-interpreter.c
+++ b/src/lib-sieve/sieve-interpreter.c
@@ -73,6 +73,21 @@ inline sieve_size_t sieve_interpreter_program_counter(struct sieve_interpreter *
 	return interpreter->pc;
 }
 
+inline bool sieve_interpreter_program_jump
+	(struct sieve_interpreter *interpreter)
+{
+	sieve_size_t pc = sieve_interpreter_program_counter(interpreter);
+	int offset = sieve_interpreter_read_offset(interpreter);
+
+	if ( pc + offset < interpreter->code_size && pc + offset > 0 ) {
+		interpreter->pc = pc + offset;
+		return TRUE;
+	}
+	
+	return FALSE;
+}
+
+
 /* Literals */
 
 int sieve_interpreter_read_offset(struct sieve_interpreter *interpreter) 
@@ -171,33 +186,47 @@ bool sieve_coded_stringlist_read_item(struct sieve_coded_stringlist *strlist, st
   }  
   
   return FALSE;
-} 
+}
 
-/* Code Dump */
+/* Opcodes and operands */
 
-static void sieve_interpreter_dump_operation
+static const struct sieve_opcode *sieve_interpreter_read_opcode
 	(struct sieve_interpreter *interpreter) 
 {
 	unsigned int opcode;
 	
 	if ( CODE_BYTES_LEFT(interpreter) > 0 ) {
 		opcode = DATA_AT_PC(interpreter);
-		
-		printf("%08x: ", interpreter->pc);
 		CODE_JUMP(interpreter, 1);
 	
 		if ( opcode < SIEVE_OPCODE_EXT_OFFSET ) {
-			sieve_opcodes[opcode].dump(interpreter);
+			return sieve_opcodes[opcode];
 		} else {
 		  const struct sieve_extension *ext = 
 		  	sieve_binary_get_extension(interpreter->binary, opcode - SIEVE_OPCODE_EXT_OFFSET);
-		  	
-		  if ( ext->opcode.dump != NULL )
-			  (void) ext->opcode.dump(interpreter);
-			else
-				printf("OPCODE: %d, Extension %s provides no opcode_dump implementation.\n", opcode, ext->name);
+		  
+		  return &(ext->opcode);	
 		}
 	}		
+	
+	return NULL;
+}
+ 
+/* Code Dump */
+
+static void sieve_interpreter_dump_operation
+	(struct sieve_interpreter *interpreter) 
+{
+	const struct sieve_opcode *opcode = sieve_interpreter_read_opcode(interpreter);
+
+	if ( opcode != NULL ) {
+		printf("%08x: ", interpreter->pc-1);
+	
+		if ( opcode->dump != NULL )
+			(void) opcode->dump(interpreter);
+		else
+			printf("<< UNSPECIFIED OPERATION >>\n");
+	}		
 }
 
 void sieve_interpreter_dump_number
@@ -296,29 +325,20 @@ void sieve_interpreter_dump_code(struct sieve_interpreter *interpreter)
 
 /* Code execute */
 
-void sieve_interpreter_execute_opcode
+bool sieve_interpreter_execute_opcode
 	(struct sieve_interpreter *interpreter) 
 {
-	unsigned int opcode;
-	
-	if ( CODE_BYTES_LEFT(interpreter) > 0 ) {
-		opcode = DATA_AT_PC(interpreter);
-		CODE_JUMP(interpreter, 1);
+	const struct sieve_opcode *opcode = sieve_interpreter_read_opcode(interpreter);
+
+	if ( opcode != NULL ) {
+		if ( opcode->execute != NULL )
+			return opcode->execute(interpreter);
+		
+		return TRUE;
+	}
 	
-		if ( opcode < SIEVE_OPCODE_EXT_OFFSET ) {
-			sieve_opcodes[opcode].execute(interpreter);
-		} else {
-		  const struct sieve_extension *ext = 
-		  	sieve_binary_get_extension(interpreter->binary, opcode - SIEVE_OPCODE_EXT_OFFSET);
-		  	
-		  printf("%08x: ", interpreter->pc-1);
-		  if ( ext->opcode.execute != NULL )
-			  (void) ext->opcode.execute(interpreter);
-			else
-				printf("OPCODE: %d, Extension %s provides no opcode_dump implementation.\n", opcode, ext->name);
-		}
-	}		
-}
+	return FALSE;
+}		
 
 struct sieve_result *sieve_interpreter_run(struct sieve_interpreter *interpreter) 
 {
@@ -328,7 +348,10 @@ struct sieve_result *sieve_interpreter_run(struct sieve_interpreter *interpreter
 	result = sieve_result_create();
 	
 	while ( interpreter->pc < interpreter->code_size ) {
-		sieve_interpreter_execute_opcode(interpreter);
+		printf("%08x:\n", interpreter->pc);
+		
+		if ( !sieve_interpreter_execute_opcode(interpreter) )
+			return NULL;
 	}
 	
 	return result;
diff --git a/src/lib-sieve/sieve-interpreter.h b/src/lib-sieve/sieve-interpreter.h
index c0e7314ec5a11d170b2fd9ba6a04f02b7dd3ad39..0c7bf2ca436f6bea73bb2ea77f10c0a78ce01aa4 100644
--- a/src/lib-sieve/sieve-interpreter.h
+++ b/src/lib-sieve/sieve-interpreter.h
@@ -14,8 +14,13 @@ struct sieve_interpreter;
 struct sieve_interpreter *sieve_interpreter_create(struct sieve_binary *binary);
 void sieve_interpreter_free(struct sieve_interpreter *interpreter);
 
-inline void sieve_interpreter_reset(struct sieve_interpreter *interpreter);
-inline sieve_size_t sieve_interpreter_program_counter(struct sieve_interpreter *interpreter);
+inline void sieve_interpreter_reset
+	(struct sieve_interpreter *interpreter);
+inline sieve_size_t sieve_interpreter_program_counter
+	(struct sieve_interpreter *interpreter);
+inline bool sieve_interpreter_program_jump
+	(struct sieve_interpreter *interpreter);
+
 
 int sieve_interpreter_read_offset(struct sieve_interpreter *interpreter);
 bool sieve_interpreter_read_integer
@@ -39,7 +44,7 @@ void sieve_interpreter_dump_code(struct sieve_interpreter *interpreter);
 
 /* Code execute */
 
-void sieve_interpreter_execute_opcode(struct sieve_interpreter *interpreter); 
+bool sieve_interpreter_execute_opcode(struct sieve_interpreter *interpreter); 
 struct sieve_result *sieve_interpreter_run(struct sieve_interpreter *interpreter);
 
 
diff --git a/src/lib-sieve/sieve-result.c b/src/lib-sieve/sieve-result.c
index 1dcc205ef700857e24b3dc056f90ff6522cacc97..b4812120b28e07c14762bcdf205cba96ac16cb0a 100644
--- a/src/lib-sieve/sieve-result.c
+++ b/src/lib-sieve/sieve-result.c
@@ -19,7 +19,7 @@ struct sieve_result {
 	unsigned int implicit_keep:1; 
 };
 
-struct sieve_result *sieve_result_create() 
+struct sieve_result *sieve_result_create(void) 
 {
 	pool_t pool;
 	struct sieve_result *result;
diff --git a/src/lib-sieve/tst-address.c b/src/lib-sieve/tst-address.c
index f3be4fda2142c05e6061e9bb06d40269afe34076..023fcfb45f5859a8728495b90ad966af2ebe5d83 100644
--- a/src/lib-sieve/tst-address.c
+++ b/src/lib-sieve/tst-address.c
@@ -1,6 +1,17 @@
+#include <stdio.h>
+
 #include "sieve-commands.h"
 #include "sieve-commands-private.h"
 #include "sieve-validator.h"
+#include "sieve-generator.h"
+#include "sieve-interpreter.h"
+
+/* Opcodes */
+
+static bool tst_address_opcode_dump(struct sieve_interpreter *interpreter);
+
+const struct sieve_opcode tst_address_opcode = 
+	{ tst_address_opcode_dump, NULL };
 
 /* Test registration */
 
@@ -69,3 +80,13 @@ bool tst_address_generate
 	return TRUE;
 }
 
+/* Code dump */
+
+static bool tst_address_opcode_dump(struct sieve_interpreter *interpreter)
+{
+    printf("ADDRESS\n");
+    sieve_interpreter_dump_operand(interpreter);
+    sieve_interpreter_dump_operand(interpreter);
+
+    return TRUE;
+}
diff --git a/src/lib-sieve/tst-exists.c b/src/lib-sieve/tst-exists.c
index 184a24ac73120f0cace7eaef32a6cd801ca3b2be..94d4183acdcb57c5f5cda578dc2a0ed1cac01104 100644
--- a/src/lib-sieve/tst-exists.c
+++ b/src/lib-sieve/tst-exists.c
@@ -1,6 +1,17 @@
+#include <stdio.h>
+
 #include "sieve-commands.h"
 #include "sieve-commands-private.h"
 #include "sieve-validator.h"
+#include "sieve-generator.h"
+#include "sieve-interpreter.h"
+
+/* Opcodes */
+
+static bool tst_exists_opcode_dump(struct sieve_interpreter *interpreter);
+
+const struct sieve_opcode tst_exists_opcode = 
+	{ tst_exists_opcode_dump, NULL };
 
 /* Test validation */
 
@@ -44,3 +55,12 @@ bool tst_exists_generate
 	return TRUE;
 }
 
+/* Code dump */
+
+static bool tst_exists_opcode_dump(struct sieve_interpreter *interpreter)
+{
+    printf("EXISTS\n");
+    sieve_interpreter_dump_operand(interpreter);
+
+    return TRUE;
+}
diff --git a/src/lib-sieve/tst-header.c b/src/lib-sieve/tst-header.c
index aa5cd645c79934fb45c8faff8a4edb7de6508df7..1bcdfc66566a6cacf7dd1718f17ff2a5b1f7a726 100644
--- a/src/lib-sieve/tst-header.c
+++ b/src/lib-sieve/tst-header.c
@@ -1,8 +1,20 @@
+#include <stdio.h>
+
 #include "sieve-commands.h"
 #include "sieve-commands-private.h"
 #include "sieve-validator.h"
+#include "sieve-generator.h"
+#include "sieve-interpreter.h"
+
+/* Opcodes */
+
+static bool tst_header_opcode_dump(struct sieve_interpreter *interpreter);
+
+const struct sieve_opcode tst_header_opcode = 
+	{ tst_header_opcode_dump, NULL };
 
 /* Test registration */
+
 bool tst_header_registered(struct sieve_validator *validator, struct sieve_command_registration *cmd_reg) 
 {
 	/* The order of these is not significant */
@@ -66,3 +78,13 @@ bool tst_header_generate
 	return TRUE;
 }
 
+/* Code dump */
+
+static bool tst_header_opcode_dump(struct sieve_interpreter *interpreter)
+{
+    printf("HEADER\n");
+    sieve_interpreter_dump_operand(interpreter);
+    sieve_interpreter_dump_operand(interpreter);
+
+    return TRUE;
+}
diff --git a/src/lib-sieve/tst-size.c b/src/lib-sieve/tst-size.c
index 1335734948999be8359c8384bc3d28f8287824dc..563f730684315b14b60d81db547931abbf26e831 100644
--- a/src/lib-sieve/tst-size.c
+++ b/src/lib-sieve/tst-size.c
@@ -1,8 +1,24 @@
+#include <stdio.h>
+
 #include "sieve-commands.h"
 #include "sieve-commands-private.h"
 #include "sieve-validator.h"
+#include "sieve-generator.h"
+#include "sieve-interpreter.h"
 #include "sieve-code.h"
 
+/* Opcodes */
+
+static bool tst_size_over_opcode_dump(struct sieve_interpreter *interpreter);
+static bool tst_size_under_opcode_dump(struct sieve_interpreter *interpreter);
+
+const struct sieve_opcode tst_size_over_opcode = 
+	{ tst_size_over_opcode_dump, NULL };
+const struct sieve_opcode tst_size_under_opcode = 
+	{ tst_size_under_opcode_dump, NULL };
+
+/* Context structures */
+
 struct tst_size_context_data {
 	enum { SIZE_UNASSIGNED, SIZE_UNDER, SIZE_OVER } type;
 	unsigned int limit;
@@ -114,3 +130,20 @@ bool tst_size_generate
 	return TRUE;
 }
 
+/* Code dump */
+
+static bool tst_size_over_opcode_dump(struct sieve_interpreter *interpreter)
+{
+    printf("SIZEOVER\n");
+    sieve_interpreter_dump_operand(interpreter);
+
+    return TRUE;
+}
+
+static bool tst_size_under_opcode_dump(struct sieve_interpreter *interpreter)
+{ 
+    printf("SIZEUNDER\n");
+    sieve_interpreter_dump_operand(interpreter);
+
+    return TRUE;
+}
diff --git a/src/sieve-bin/Makefile b/src/sieve-bin/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..452e69a4500a5c86691baa3597b32a8c1a8b2e2f
--- /dev/null
+++ b/src/sieve-bin/Makefile
@@ -0,0 +1,492 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# src/sieve-bin/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+srcdir = .
+top_srcdir = ../..
+
+pkgdatadir = $(datadir)/dovecot-libsieve
+pkglibdir = $(libdir)/dovecot-libsieve
+pkgincludedir = $(includedir)/dovecot-libsieve
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
+sbin_PROGRAMS = sievec$(EXEEXT)
+subdir = src/sieve-bin
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/libsieve-config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(sbindir)"
+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(sbin_PROGRAMS)
+am_sievec_OBJECTS = sievec.$(OBJEXT)
+sievec_OBJECTS = $(am_sievec_OBJECTS)
+am__DEPENDENCIES_1 = $(top_srcdir)/src/lib-sieve/libsieve.a \
+	$(dovecot_incdir)/src/lib/liblib.a
+am__DEPENDENCIES_2 = $(plugin_dir)/vacation/lib_ext_vacation.a
+am__DEPENDENCIES_3 =
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(sievec_SOURCES)
+DIST_SOURCES = $(sievec_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = ${SHELL} /home/stephan/src/dovecot-libsieve/missing --run aclocal-1.9
+AMDEP_FALSE = #
+AMDEP_TRUE = 
+AMTAR = ${SHELL} /home/stephan/src/dovecot-libsieve/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /home/stephan/src/dovecot-libsieve/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/stephan/src/dovecot-libsieve/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/stephan/src/dovecot-libsieve/missing --run automake-1.9
+AWK = gawk
+CC = gcc
+CCDEPMODE = depmode=gcc3
+CFLAGS = -std=gnu99 -g -O2 -Wall -W -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wformat=2 -Wbad-function-cast 
+CPP = gcc -E
+CPPFLAGS = 
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+ECHO = echo
+ECHO_C = 
+ECHO_N = -n
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GREP = /bin/grep
+HAVE_DOVECOT_LIBS_FALSE = #
+HAVE_DOVECOT_LIBS_TRUE = 
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+LDFLAGS = 
+LIBICONV = 
+LIBOBJS = 
+LIBS = 
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LN_S = ln -s
+LTLIBOBJS = 
+MAINT = #
+MAINTAINER_MODE_FALSE = 
+MAINTAINER_MODE_TRUE = #
+MAKEINFO = ${SHELL} /home/stephan/src/dovecot-libsieve/missing --run makeinfo
+MODULE_LIBS = -export-dynamic -ldl
+OBJEXT = o
+PACKAGE = dovecot-libsieve
+PACKAGE_BUGREPORT = stephan@rename-it.nl
+PACKAGE_NAME = dovecot-libsieve
+PACKAGE_STRING = dovecot-libsieve 1.0.2
+PACKAGE_TARNAME = dovecot-libsieve
+PACKAGE_VERSION = 1.0.2
+PATH_SEPARATOR = :
+RAND_LIBS = 
+RANLIB = ranlib
+SET_MAKE = 
+SHELL = /bin/bash
+STORAGE_LIBS =  /home/stephan/src/dovecot/dovecot-1.0.2/src/lib-storage/index/maildir/libstorage_maildir.a /home/stephan/src/dovecot/dovecot-1.0.2/src/lib-storage/index/mbox/libstorage_mbox.a /home/stephan/src/dovecot/dovecot-1.0.2/src/lib-storage/index/libstorage_index.a /home/stephan/src/dovecot/dovecot-1.0.2/src/lib-index/libindex.a
+STRIP = strip
+VERSION = 1.0.2
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__fastdepCC_FALSE = #
+am__fastdepCC_TRUE = 
+am__fastdepCXX_FALSE = #
+am__fastdepCXX_TRUE = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+bindir = ${exec_prefix}/bin
+build = i686-pc-linux-gnu
+build_alias = 
+build_cpu = i686
+build_os = linux-gnu
+build_vendor = pc
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+dovecot_incdir = /home/stephan/src/dovecot/dovecot-1.0.2
+dovecotdir = /home/stephan/src/dovecot/dovecot-1.0.2
+dvidir = ${docdir}
+exec_prefix = ${prefix}
+host = i686-pc-linux-gnu
+host_alias = 
+host_cpu = i686
+host_os = linux-gnu
+host_vendor = pc
+htmldir = ${docdir}
+includedir = ${prefix}/include
+infodir = ${datarootdir}/info
+install_sh = /home/stephan/src/dovecot-libsieve/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localedir = ${datarootdir}/locale
+localstatedir = ${prefix}/var
+mandir = ${datarootdir}/man
+mkdir_p = mkdir -p --
+moduledir = /usr/local/lib/dovecot
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+prefix = /usr/local
+program_transform_name = s,x,x,
+psdir = ${docdir}
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+sysconfdir = ${prefix}/etc
+target_alias = 
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/lib-sieve \
+	-I$(dovecot_incdir) \
+	-I$(dovecot_incdir)/src/lib \
+	-I$(dovecot_incdir)/src/lib-mail \
+	-I$(dovecot_incdir)/src/lib-storage 
+
+plugin_dir = \
+	$(top_srcdir)/src/lib-sieve/plugins
+
+plugins = \
+	$(plugin_dir)/vacation/lib_ext_vacation.a
+
+sievec_LDFLAGS = -export-dynamic
+libs = \
+	$(top_srcdir)/src/lib-sieve/libsieve.a \
+	$(dovecot_incdir)/src/lib/liblib.a
+
+sievec_LDADD = \
+	$(libs) \
+	$(plugins) \
+ 	$(LIBICONV) \
+    $(RAND_LIBS) \
+    $(MODULE_LIBS)
+
+sievec_DEPENDENCIES = $(libs)
+sievec_SOURCES = \
+	sievec.c 
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/sieve-bin/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/sieve-bin/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: # $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-sbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
+	done
+
+clean-sbinPROGRAMS:
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+sievec$(EXEEXT): $(sievec_OBJECTS) $(sievec_DEPENDENCIES) 
+	@rm -f sievec$(EXEEXT)
+	$(LINK) $(sievec_LDFLAGS) $(sievec_OBJECTS) $(sievec_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/sievec.Po
+
+.c.o:
+	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(sbindir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-sbinPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-sbinPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-sbinPROGRAMS
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-sbinPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-sbinPROGRAMS install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-sbinPROGRAMS
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/sieve-bin/Makefile.am b/src/sieve-bin/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..b2578fb6b714f1aa25c51a7cde825a6bf5a81a10
--- /dev/null
+++ b/src/sieve-bin/Makefile.am
@@ -0,0 +1,34 @@
+sbin_PROGRAMS = sievec
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/lib-sieve \
+	-I$(dovecot_incdir) \
+	-I$(dovecot_incdir)/src/lib \
+	-I$(dovecot_incdir)/src/lib-mail \
+	-I$(dovecot_incdir)/src/lib-storage 
+
+
+plugin_dir = \
+	$(top_srcdir)/src/lib-sieve/plugins
+
+plugins = \
+	$(plugin_dir)/vacation/lib_ext_vacation.a
+
+sievec_LDFLAGS = -export-dynamic
+
+libs = \
+	$(top_srcdir)/src/lib-sieve/libsieve.a \
+	$(dovecot_incdir)/src/lib/liblib.a
+
+sievec_LDADD = \
+	$(libs) \
+	$(plugins) \
+ 	$(LIBICONV) \
+    $(RAND_LIBS) \
+    $(MODULE_LIBS)
+
+sievec_DEPENDENCIES = $(libs)
+
+sievec_SOURCES = \
+	sievec.c 
+
diff --git a/src/sieve-bin/Makefile.in b/src/sieve-bin/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..d85ef8ef2524b88535c06615016a49ada85433db
--- /dev/null
+++ b/src/sieve-bin/Makefile.in
@@ -0,0 +1,492 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+sbin_PROGRAMS = sievec$(EXEEXT)
+subdir = src/sieve-bin
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/libsieve-config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(sbindir)"
+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(sbin_PROGRAMS)
+am_sievec_OBJECTS = sievec.$(OBJEXT)
+sievec_OBJECTS = $(am_sievec_OBJECTS)
+am__DEPENDENCIES_1 = $(top_srcdir)/src/lib-sieve/libsieve.a \
+	$(dovecot_incdir)/src/lib/liblib.a
+am__DEPENDENCIES_2 = $(plugin_dir)/vacation/lib_ext_vacation.a
+am__DEPENDENCIES_3 =
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(sievec_SOURCES)
+DIST_SOURCES = $(sievec_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+HAVE_DOVECOT_LIBS_FALSE = @HAVE_DOVECOT_LIBS_FALSE@
+HAVE_DOVECOT_LIBS_TRUE = @HAVE_DOVECOT_LIBS_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MODULE_LIBS = @MODULE_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RAND_LIBS = @RAND_LIBS@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STORAGE_LIBS = @STORAGE_LIBS@
+STRIP = @STRIP@
+VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dovecot_incdir = @dovecot_incdir@
+dovecotdir = @dovecotdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/lib-sieve \
+	-I$(dovecot_incdir) \
+	-I$(dovecot_incdir)/src/lib \
+	-I$(dovecot_incdir)/src/lib-mail \
+	-I$(dovecot_incdir)/src/lib-storage 
+
+plugin_dir = \
+	$(top_srcdir)/src/lib-sieve/plugins
+
+plugins = \
+	$(plugin_dir)/vacation/lib_ext_vacation.a
+
+sievec_LDFLAGS = -export-dynamic
+libs = \
+	$(top_srcdir)/src/lib-sieve/libsieve.a \
+	$(dovecot_incdir)/src/lib/liblib.a
+
+sievec_LDADD = \
+	$(libs) \
+	$(plugins) \
+ 	$(LIBICONV) \
+    $(RAND_LIBS) \
+    $(MODULE_LIBS)
+
+sievec_DEPENDENCIES = $(libs)
+sievec_SOURCES = \
+	sievec.c 
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/sieve-bin/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/sieve-bin/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-sbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
+	done
+
+clean-sbinPROGRAMS:
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+sievec$(EXEEXT): $(sievec_OBJECTS) $(sievec_DEPENDENCIES) 
+	@rm -f sievec$(EXEEXT)
+	$(LINK) $(sievec_LDFLAGS) $(sievec_OBJECTS) $(sievec_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sievec.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(sbindir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-sbinPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-sbinPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-sbinPROGRAMS
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-sbinPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-sbinPROGRAMS install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-sbinPROGRAMS
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/sieve-bin/sievec b/src/sieve-bin/sievec
new file mode 100755
index 0000000000000000000000000000000000000000..dfe3689ce84f77240f613a8c57a14c8b3869a389
Binary files /dev/null and b/src/sieve-bin/sievec differ
diff --git a/src/lib-sieve/sievec.c b/src/sieve-bin/sievec.c
similarity index 96%
rename from src/lib-sieve/sievec.c
rename to src/sieve-bin/sievec.c
index cafc4240c34f6cbd26f186ad5a0a8ead0b8b94b4..50d5981bd5a392fe16c5cae31b6616ffd8e8b1cb 100644
--- a/src/lib-sieve/sievec.c
+++ b/src/sieve-bin/sievec.c
@@ -83,6 +83,9 @@ int main(int argc, char **argv) {
 				
 				sieve_interpreter_dump_code(interpreter);
 				
+				printf("Code Execute:\n\n");
+				(void) sieve_interpreter_run(interpreter);
+				
 				sieve_interpreter_free(interpreter);
 			}
 			
diff --git a/src/sieve-bin/sievec.o b/src/sieve-bin/sievec.o
new file mode 100644
index 0000000000000000000000000000000000000000..cae0223aa00f695c13e1eb7a45d401683c4d13c1
Binary files /dev/null and b/src/sieve-bin/sievec.o differ