diff --git a/hadolint.cabal b/hadolint.cabal
--- a/hadolint.cabal
+++ b/hadolint.cabal
@@ -2,10 +2,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: dad086f0af35e0c451cefe4a1513876be3f752b5251b47db3267dc37fc59edd6
+-- hash: f24dbfc28b7f07ed86a83c5099ee99d1b02891582b069a151426cc7980798281
 
 name:           hadolint
-version:        1.6.1
+version:        1.6.2
 synopsis:       Dockerfile Linter JavaScript API
 description:    A smarter Dockerfile linter that helps you build best practice Docker images.
 category:       Development
diff --git a/src/Hadolint/Rules.hs b/src/Hadolint/Rules.hs
--- a/src/Hadolint/Rules.hs
+++ b/src/Hadolint/Rules.hs
@@ -3,7 +3,8 @@
 module Hadolint.Rules where
 
 import Control.Arrow ((&&&))
-import Data.List (isInfixOf, isPrefixOf, isSuffixOf, mapAccumL)
+import Data.List
+       (dropWhile, isInfixOf, isPrefixOf, isSuffixOf, mapAccumL)
 import Data.List.NonEmpty (toList)
 import Data.List.Split (splitOneOf)
 import Hadolint.Bash
@@ -377,7 +378,8 @@
     imageIsUsedLater line baseimage =
         case fromAlias baseimage of
             Nothing -> True
-            Just (ImageAlias alias) -> alias `elem` [i | (l, i) <- allImageNames dockerfile, l > line]
+            Just (ImageAlias alias) ->
+                alias `elem` [i | (l, i) <- allImageNames dockerfile, l > line]
 
 dropOptionsWithArg :: [String] -> [String] -> [String]
 dropOptionsWithArg os [] = []
@@ -459,34 +461,46 @@
     message =
         "Pin versions in pip. Instead of `pip install <package>` use `pip install \
         \<package>==<version>`"
-    check (Run (Arguments args)) =
-        not (isPipInstall args) ||
-        (isRecursiveInstall args || isSetupPyInstall args || all versionFixed (packages args))
+    check (Run (Arguments args)) = not (isPipInstall args) || all versionFixed (packages args)
     check _ = True
-    isVersionedGit :: String -> Bool
+    isPipInstall :: [String] -> Bool
+    isPipInstall cmd =
+        case getInstallArgs cmd of
+            Nothing -> False
+            Just args -> not (["-r"] `isInfixOf` args || ["."] `isInfixOf` args)
+    packages cmd =
+        case getInstallArgs cmd of
+            Nothing -> []
+            Just args -> findPackages args
+    getInstallArgs = stripInstallPrefix isInstallCommand
+    isInstallCommand ('p':'i':'p':_) = True
+    isInstallCommand _ = False
+    versionFixed package = hasVersionSymbol package || isVersionedGit package
     isVersionedGit package = "git+http" `isInfixOf` package && "@" `isInfixOf` package
     versionSymbols = ["==", ">=", "<=", ">", "<", "!="]
-    hasVersionSymbol :: String -> Bool
     hasVersionSymbol package = or [s `isInfixOf` package | s <- versionSymbols]
-    versionFixed :: String -> Bool
-    versionFixed package = hasVersionSymbol package || isVersionedGit package
-    isPipInstall :: [String] -> Bool
-    isPipInstall cmd =
-        ["pip", "install"] `isInfixOf` cmd ||
-        ["pip3", "install"] `isInfixOf` cmd || ["pip2", "install"] `isInfixOf` cmd
-    isRecursiveInstall :: [String] -> Bool
-    isRecursiveInstall cmd = ["-r"] `isInfixOf` cmd
-    isSetupPyInstall :: [String] -> Bool
-    isSetupPyInstall cmd = ["."] `isInfixOf` cmd
-    -- | Returns all the packages after pip install
-    packages :: [String] -> [String]
-    packages args = concat [filter noOption cmd | cmd <- bashCommands args, isPipInstall cmd]
-      where
-        noOption arg = arg `notElem` commandName && not (isFlag arg)
-        commandName = ["pip", "pip2", "pip3", "install"]
-        isFlag ('-':_) = True
-        isFlag _ = False
 
+-- | Returns all the packages after pip install
+findPackages :: [String] -> [String]
+findPackages = takeWhile (not . isEnd) . dropWhile isFlag
+  where
+    isEnd word = isFlag word || word `elem` ["&&", "||", ";", "|"]
+    isFlag ('-':_) = True
+    isFlag _ = False
+
+stripInstallPrefix :: (String -> Bool) -> [String] -> Maybe [String]
+stripInstallPrefix isCommand args =
+    if ["install"] `isPrefixOf` dropUntilInstall
+        then dropUntilInstall |> drop 1 |> Just
+        else Nothing
+  where
+    dropUntilInstall =
+        args |> -- using a pipiline for readability
+        dropWhile (not . isCommand) |>
+        drop 1 |>
+        dropWhile (/= "install")
+    a |> f = f a
+
 {-|
   Rule for pinning NPM packages to version, tag, or commit
   supported formats by Hadolint
@@ -506,24 +520,18 @@
         \<package>@<version>`"
     check (Run (Arguments args)) = all versionFixed (packages args)
     check _ = True
-    packages :: [String] -> [String]
-    packages args = concat [filter noOption cmd | cmd <- bashCommands args, isNpmInstall cmd]
-      where
-        noOption arg = arg `notElem` options && not ("--" `isPrefixOf` arg)
-        options = ["npm", "install", "-g", "-f"]
-    isNpmInstall :: [String] -> Bool
-    isNpmInstall cmd = ["npm", "install"] `isInfixOf` cmd
-    versionFixed :: String -> Bool
+    packages cmd =
+        case getInstallArgs cmd of
+            Nothing -> []
+            Just args -> findPackages args
+    getInstallArgs = stripInstallPrefix (== "npm")
     versionFixed package =
         if hasGitPrefix package
             then isVersionedGit package
             else hasVersionSymbol package
     gitPrefixes = ["git://", "git+ssh://", "git+http://", "git+https://"]
-    hasGitPrefix :: String -> Bool
     hasGitPrefix package = or [p `isPrefixOf` package | p <- gitPrefixes]
-    isVersionedGit :: String -> Bool
     isVersionedGit package = "#" `isInfixOf` package
-    hasVersionSymbol :: String -> Bool
     hasVersionSymbol package = "@" `isInfixOf` dropScope package
       where
         dropScope package =
diff --git a/test/Spec.hs b/test/Spec.hs
--- a/test/Spec.hs
+++ b/test/Spec.hs
@@ -200,6 +200,8 @@
                 ruleCatchesNot pipVersionPinned "RUN pip install MySQL_python==1.2.2"
             it "pip version pinned with flag" $
                 ruleCatchesNot pipVersionPinned "RUN pip install --ignore-installed MySQL_python==1.2.2"
+            it "pip version pinned with python -m" $
+                ruleCatchesNot pipVersionPinned "RUN python -m pip install example==1.2.2"
             it "pip install git" $
                 ruleCatchesNot
                     pipVersionPinned