diff --git a/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/Picard.scala b/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/Picard.scala
index a20869a4ebab732597b5d8eae1b966e3dabf7aa6..1517e3d936afff135d0747b1d5ceb1f2df2cf897 100644
--- a/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/Picard.scala
+++ b/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/Picard.scala
@@ -95,15 +95,15 @@ object Picard extends Logging {
 
         logger.debug("dependencies: " + dependencies)
 
-        val htsjdk = dependencies.find(dep => dep("groupId") == "samtools" && dep("artifactId") == "htsjdk").collect {
-          case dep =>
-            "samtools htsjdk " + dep("version")
-        }
-
-        dependencies.find(dep => dep("groupId") == "picard" && dep("artifactId") == "picard").collect {
-          case dep =>
-            "Picard " + dep("version") + " using " + htsjdk.getOrElse("unknown htsjdk")
-        }
+        val htsjdk = dependencies.find(dep =>
+          (dep("groupId") == "com.github.samtools" || dep("groupId") == "samtools") &&
+            dep("artifactId") == "htsjdk")
+          .collect { case dep => "samtools htsjdk " + dep("version") }
+
+        dependencies.find(dep =>
+          (dep("groupId") == "com.github.broadinstitute" || dep("groupId") == "picard") &&
+            dep("artifactId") == "picard")
+          .collect { case dep => "Picard " + dep("version") + " using " + htsjdk.getOrElse("unknown htsjdk") }
       case otherwise => None
     }
   }