diff --git a/src/iohelpers.cpp b/src/iohelpers.cpp
new file mode 100644
index 0000000..7cc7951
--- /dev/null
+++ b/src/iohelpers.cpp
@@ -0,0 +1,37 @@
+
+/*
+ * This file is part of Codecrypt.
+ *
+ * Codecrypt is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Codecrypt 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 Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Codecrypt. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "iohelpers.h"
+
+bool redirect_cin (const std::string& fn)
+{
+	static std::ifstream alt_cin;
+	alt_cin.open (fn.c_str(), std::ios::in | std::ios::binary);
+	if (alt_cin.fail() ) return false;
+	std::cin.rdbuf (alt_cin.rdbuf() );
+	return true;
+}
+
+bool redirect_cout (const std::string& fn)
+{
+	static std::ifstream alt_cout;
+	alt_cout.open (fn.c_str(), std::ios::out | std::ios::binary);
+	if (alt_cout.fail() ) return false;
+	std::cout.rdbuf (alt_cout.rdbuf() );
+	return true;
+}
diff --git a/src/outhelpers.h b/src/iohelpers.h
similarity index 82%
rename from src/outhelpers.h
rename to src/iohelpers.h
index 3a58c45..fe3939b 100644
--- a/src/outhelpers.h
+++ b/src/iohelpers.h
@@ -16,19 +16,25 @@
  * along with Codecrypt. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _ccr_outhelpers_h_
-#define _ccr_outhelpers_h_
+#ifndef _ccr_iohelpers_h_
+#define _ccr_iohelpers_h_
 
 /*
  * output helpers
  */
 
 #include <iostream>
+#include <fstream>
+#include <string>
 
 #define out(x) std::cout << x << std::endl
 #define outeol std::cout << std::endl
 #define err(x) std::cerr << x << std::endl
 #define erreol std::cerr << std::endl
 #define progerr(x) std::cerr << argv[0] << ": " << x << std::endl
+#define in(x) std::cin >> x;
+
+bool redirect_cin (const std::string& fn);
+bool redirect_cout (const std::string& fn);
 
 #endif
diff --git a/src/main.cpp b/src/main.cpp
index 3d0736a..948ea9c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,7 +16,7 @@
  * along with Codecrypt. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "outhelpers.h"
+#include "iohelpers.h"
 
 void print_version()
 {
@@ -301,19 +301,35 @@ int main (int argc, char**argv)
 	if (!KR.load() ) {
 		err ("could not load keyring!");
 		exitval = 1;
-		goto exit_ok;
+		goto exit;
 	}
 
 	//register all available algorithms
 	fill_algorithm_suite (AS);
 
+	/*
+	 * cin/cout redirection
+	 */
+
+	if (input.length() && !redirect_cin (input) ) {
+		progerr ("could not open input file");
+		exitval = 1;
+		goto exit;
+	}
+
+	if (output.length() && !redirect_cout (output) ) {
+		progerr ("could not redirect to output file");
+		exitval = 1;
+		goto exit;
+	}
+
 	/*
 	 * check the option flags and do whatever was requested
 	 */
 
 	if (do_test) {
 		test();
-		goto exit_ok;
+		goto exit;
 	}
 
 	switch (action) {
@@ -402,7 +418,7 @@ int main (int argc, char**argv)
 	 * also ensure and verify that it was written back correctly.
 	 */
 
-exit_ok:
+exit:
 	if (!KR.close() ) {
 		err ("could not close keyring, "
 		     "something weird is going to happen.");