diff --git a/ConfsolveArgs.hs b/ConfsolveArgs.hs
--- a/ConfsolveArgs.hs
+++ b/ConfsolveArgs.hs
@@ -19,7 +19,7 @@
    &= helpArg [explicit, name "help", name "h"]
    &= versionArg [explicit, name "version", name "v", summary versionInfo ]
 
-versionInfo = "confsolve version 0.3.8"
+versionInfo = "confsolve version 0.4.1"
 summaryInfo = ""
 
 confsolveArgs :: IO Confsolve
diff --git a/Wuala/FileNameParser.hs b/Wuala/FileNameParser.hs
--- a/Wuala/FileNameParser.hs
+++ b/Wuala/FileNameParser.hs
@@ -2,7 +2,7 @@
 
 module Wuala.FileNameParser where
 
-import Control.Applicative ((<*>), (<$>), (*>))
+import Control.Applicative ((<*>), (<$>), (*>), (<*), (<|>), pure)
 import qualified Data.Attoparsec.Text as P
 import qualified Data.Text as T
 import Data.Char (isNumber)
@@ -17,8 +17,9 @@
 fileInfo :: P.Parser FileInfo
 fileInfo = FileInfo <$> (T.strip <$> tillLeftPar)
                     <*> (P.string "(conflicting version " *> version)
-                    <*> (P.string " from " *> tillRightPar)
+                    <*> maybeHost
    where
+      maybeHost    = (P.string " from " *> tillRightPar) <|> (pure "" <* P.char ')')
       version      = P.takeWhile1 isNumber
       tillLeftPar  = P.takeWhile1 (/= '(')
       tillRightPar = P.takeWhile1 (/= ')')
diff --git a/confsolve.cabal b/confsolve.cabal
--- a/confsolve.cabal
+++ b/confsolve.cabal
@@ -1,5 +1,5 @@
 Name:          confsolve
-Version:       0.3.8
+Version:       0.4.1
 License:       BSD3
 License-file:  LICENSE
 Author:        Daniel Trstenjak
@@ -26,4 +26,4 @@
                  Wuala.FileNameParser
                  ConfsolveArgs
   ghc-options:   -funbox-strict-fields
-  Build-Depends: base >= 3 && < 5, time, process, unordered-containers, text, attoparsec, system-filepath, system-fileio, cmdargs
+  Build-Depends: base >= 3 && < 5, time, process, unordered-containers, text, attoparsec, system-filepath >= 0.4.8, system-fileio, cmdargs