diff --git a/lib/processCss.js b/lib/processCss.js
index e7c8a04b..d2e8ac06 100644
--- a/lib/processCss.js
+++ b/lib/processCss.js
@@ -167,17 +167,20 @@ module.exports = function processCss(inputSource, inputMap, options) {
 		}));
 	}
 
-	var result = pipeline.process(inputSource, {
+    var opts = {
 		from: options.from,
-		to: options.to,
-		map: {
+		to: options.to
+    }
+    if ( query.sourcemap ) {
+		opts.map = {
 			prev: inputMap,
 			sourcesContent: true,
 			inline: false,
 			annotation: false
 		}
-	});
 
+    }
+	var result = pipeline.process(inputSource, opts);
 
 	return {
 		source: result.css,
diff --git a/package.json b/package.json
index 21c3dcea..3c0b4fce 100644
--- a/package.json
+++ b/package.json
@@ -7,9 +7,9 @@
     "css-selector-tokenizer": "^0.5.1",
     "cssnano": "^2.1.0",
     "loader-utils": "~0.2.2",
-    "postcss": "^4.1.11",
+    "postcss": "git://github.com/shekhei/postcss.git",
     "postcss-modules-extract-imports": "0.0.5",
-    "postcss-modules-local-by-default": "0.0.11",
+    "postcss-modules-local-by-default": "git://github.com/shekhei/postcss-modules-local-by-default.git",
     "postcss-modules-scope": "0.0.8",
     "source-list-map": "^0.1.4"
   },