diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,9 @@
 # Version history of koji-tool
 
+# 0.8.5 (2022-05-10)
+- use rpm-nvr-0.1.2 for better NVR and NVRA parsing ensuring non-empty names
+- when parsing koji build request fields, detect git hash and fork builds
+
 # 0.8.4 (2022-05-09)
 - Install: completely rework logic using installed status and NVRA etc
 - install: '--no-reinstall' replaces '--reinstall-nvrs'
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@
 ## Commands
 ```shellsession
 $ koji-tool --version
-0.8.4
+0.8.5
 $ koji-tool --help
 Query and track Koji tasks, and install rpms from Koji.
 
diff --git a/koji-tool.cabal b/koji-tool.cabal
--- a/koji-tool.cabal
+++ b/koji-tool.cabal
@@ -1,5 +1,5 @@
 name:                koji-tool
-version:             0.8.4
+version:             0.8.5
 synopsis:            Koji CLI tool for querying tasks and installing builds
 description:
         koji-tool is a CLI interface to Koji with commands to query
@@ -53,7 +53,7 @@
                        http-directory >= 0.1.9,
                        koji >= 0.0.2,
                        pretty-simple,
-                       rpm-nvr >= 0.1.1,
+                       rpm-nvr >= 0.1.2,
                        simple-cmd,
                        simple-cmd-args >= 0.1.7,
                        text,
diff --git a/src/Utils.hs b/src/Utils.hs
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -5,6 +5,7 @@
   )
 where
 
+import Data.List (isInfixOf, isPrefixOf)
 import Data.RPM (dropArch)
 import Data.RPM.NVR
 import Data.RPM.NVRA
@@ -29,8 +30,13 @@
         Nothing -> Left $ unwords $ map showValue $ take 2 req
         Just src ->
           case maybeNVRA src of
-            Just nvra -> Right $ dropArch nvra
-            Nothing -> Left $ takeBaseName src
+            Just nvra | not (".git#" `isInfixOf` src) ->
+                        Right $ dropArch nvra
+            _ -> let base = takeBaseName src in
+                   Left $
+                   if "fedora-ci_" `isPrefixOf` base
+                   then tail $ dropWhile (/= ';') base
+                   else base
     _ -> error' "could determine package from build request"
 
 showValue :: Value -> String