diff --git a/ChangeLog b/ChangeLog
index 0de566b..90e233e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2017-02-16: 2.2.2
 	 fix: checkgauge 'insist'
-	 fix: no partial path exlusion tests
+	 fix: no partial path exclusion tests
 	 fix: write pid of forked process in pidfile
 	 fix: crash on not reachable target
 	 workaround:
@@ -12,7 +12,7 @@
 	enhancement: now always using filter lists with rysnc
 		instead of include/exclude lists taking advantage of the new --delete-missing-args
 		parameter to delete files on target.
-		>>> Thus Lsyncd 2.1.1 needs rsync >= 3.1.0
+		>>> Thus Lsyncd 2.2.1 needs rsync >= 3.1.0
 	change: added "tests" make target to run all the tests.
 	fix: crash due to typo in changed ^path, ^pathdir, ^pathname
 
diff --git a/lsyncd.c b/lsyncd.c
index 746f2d4..5ab21fd 100644
--- a/lsyncd.c
+++ b/lsyncd.c
@@ -2889,6 +2889,9 @@ main( int argc, char * argv[ ] )
 	// gets a kernel parameter
 	clocks_per_sec = sysconf( _SC_CLK_TCK );
 
+	setlinebuf( stdout );
+	setlinebuf( stderr );
+
 	while( !term ) {
 		main1( argc, argv );
 	}