diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e580bbfc..4adac7060 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,7 +84,10 @@ function(configureProject)
 		add_definitions(-DETH_CURL)
 	endif()
 
-	add_definitions(-DNOBOOST)
+	if (NOBOOST)
+		add_definitions(-DNOBOOST)
+	endif()
+
 	add_definitions(-DETH_TRUE)
 endfunction()
 
diff --git a/ethminer/MinerAux.h b/ethminer/MinerAux.h
index a4a671ddb..e123cdbb1 100644
--- a/ethminer/MinerAux.h
+++ b/ethminer/MinerAux.h
@@ -163,7 +163,7 @@ public:
 			catch (...)
 			{
 				cerr << "Bad " << arg << " option: " << argv[i] << endl;
-				BOOST_THROW_EXCEPTION( BadArgument());
+				BOOST_THROW_EXCEPTION(BadArgument());
 			}
 		else if (arg == "--benchmark-trials" && i + 1 < argc)
 			try {
@@ -172,7 +172,7 @@ public:
 			catch (...)
 			{
 				cerr << "Bad " << arg << " option: " << argv[i] << endl;
-				BOOST_THROW_EXCEPTION( BadArgument());
+				BOOST_THROW_EXCEPTION(BadArgument());
 			}
 		else if (arg == "-C" || arg == "--cpu")
 			m_minerType = MinerType::CPU;
@@ -195,7 +195,7 @@ public:
 			catch (...)
 			{
 				cerr << "Bad " << arg << " option: " << m << endl;
-				BOOST_THROW_EXCEPTION( BadArgument());
+				BOOST_THROW_EXCEPTION(BadArgument());
 			}
 		}
 		else if ((arg == "-w" || arg == "--check-pow") && i + 4 < argc)
@@ -232,7 +232,7 @@ public:
 			catch (...)
 			{
 				cerr << "Bad " << arg << " option: " << m << endl;
-				BOOST_THROW_EXCEPTION( BadArgument());
+				BOOST_THROW_EXCEPTION(BadArgument());
 			}
 		}
 		else if (arg == "-M" || arg == "--benchmark")
@@ -245,7 +245,7 @@ public:
 			catch (...)
 			{
 				cerr << "Bad " << arg << " option: " << argv[i] << endl;
-				BOOST_THROW_EXCEPTION( BadArgument());
+				BOOST_THROW_EXCEPTION(BadArgument());
 			}
 		}
 		else