diff --git a/main.c b/main.c
index 5b5a1b1..7faed3f 100644
--- a/main.c
+++ b/main.c
@@ -7,9 +7,11 @@
 #include "transliteration.h"
 #include "iast.h"
 #include "iast-czech.h"
+#include "encoder.h"
 
 #define FLAG_STDIN	1 << 0
 #define FLAG_CZECH	1 << 1
+#define FLAG_ENCODE	1 << 2
 
 
 static char *stdin_read()
@@ -53,6 +55,9 @@ int main(int argc, const char **argv)
 			case 'c':
 				flags |= FLAG_CZECH;
 				continue;
+			case 'e':
+				flags |= FLAG_ENCODE;
+				continue;
 			}
 
 			fprintf(stderr, "error: unknown option '%s'\n", arg);
@@ -62,6 +67,15 @@ int main(int argc, const char **argv)
 		}
 	}
 
+	if (flags & FLAG_ENCODE) {
+		for (i = 0; i < n; i++) {
+			output = encode_iast_punctation(queue[i]);
+			fprintf(stdout, "%s\n", output);
+			free(output);
+		}
+		goto out;
+	}
+
 	context = (flags & FLAG_CZECH)
 		? transliteration_context_iast_czech_alloc()
 		: transliteration_context_iast_alloc();
@@ -71,7 +85,7 @@ int main(int argc, const char **argv)
 		if (input == NULL) {
 			fprintf(stderr, "[iast] failed to read from STDIN.\n");
 			retval = -1;
-			goto out;
+			goto drop_context;
 		}
 
 		output = transliterate_devanagari_to_latin(input, context);
@@ -86,8 +100,8 @@ int main(int argc, const char **argv)
 		free(output);
 	}
 
-out:
+drop_context:
 	transliteration_context_drop(context);
-
+out:
 	return retval;
 }