diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index 00e19749..d135691a 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -225,6 +225,8 @@ int main(int argc, char * * argv)
     std::cerr.rdbuf()->pubsetbuf(buf, sizeof(buf));
 #endif
 
+    std::ios::sync_with_stdio(false);
+
     try {
         try {
             initAndRun(argc, argv);
diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc
index 5a87806d..8c2ff227 100644
--- a/src/nix-store/main.cc
+++ b/src/nix-store/main.cc
@@ -632,7 +632,7 @@ static void opDump(Strings opFlags, Strings opArgs)
 }
 
 
-/* A source that read restore intput to stdin. */
+/* A source that reads restore input from stdin. */
 struct StdinSource : RestoreSource
 {
     virtual void operator () (unsigned char * data, unsigned int len)