diff --git a/src/VCSGui/Common/SetupConfig.hs b/src/VCSGui/Common/SetupConfig.hs
--- a/src/VCSGui/Common/SetupConfig.hs
+++ b/src/VCSGui/Common/SetupConfig.hs
@@ -21,8 +21,7 @@
 import Control.Monad
 import System.Directory
 import System.Directory(doesDirectoryExist)
-import Data.List.Utils(elemRIndex)
-import Data.List(isInfixOf)
+import Data.List(findIndex)
 import Paths_vcsgui(getDataFileName)
 
 import VCSGui.Common.Error
@@ -241,15 +240,12 @@
                                     H.set (entRepo gui) $ path
                                     availableVCS <- discoverVCS path
                                     H.set (comboBoxVCSType gui) $ map (\vcs -> show vcs) availableVCS
-                                    if isInfixOf [vcsType] availableVCS
-                                        then do
-                                        --get position (hopefully always index in liststore = index in list)
-                                        let index = elemRIndex vcsType availableVCS
-
-                                        --set active
-                                        comboBoxSetActive (H.getItem (comboBoxVCSType gui)) $ fromMaybe (-1) index
-                                        else do
-                                        return ()
+                                    --get position (hopefully always index in liststore = index in list)
+                                    case findIndex (== vcsType) availableVCS of
+                                        Just index ->
+                                            --set active
+                                            comboBoxSetActive (H.getItem (comboBoxVCSType gui)) index
+                                        _ -> return ()
                 case mbExec of
                     Nothing -> do
                                     H.set (checkbtExec gui) False
diff --git a/src/VCSGui/Git/Log.hs b/src/VCSGui/Git/Log.hs
--- a/src/VCSGui/Git/Log.hs
+++ b/src/VCSGui/Git/Log.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 -----------------------------------------------------------------------------
 --
 -- Module      :  VCSGui.Git.Log
@@ -49,7 +50,11 @@
     askForNewBranchname = do
         dialog <- Gtk.dialogNew
         Gtk.dialogAddButton dialog "gtk-ok" Gtk.ResponseOk
+#if MIN_VERSION_gtk(0,13,0) || defined(MIN_VERSION_gtk3)
         upper <- Gtk.dialogGetContentArea dialog
+#else
+        upper <- Gtk.dialogGetUpper dialog
+#endif
 
         inputBranch <- Gtk.entryNew
         lblBranch <- Gtk.labelNew $ Just "Enter a new branchname (empty for anonym branch):"
diff --git a/vcsgui.cabal b/vcsgui.cabal
--- a/vcsgui.cabal
+++ b/vcsgui.cabal
@@ -1,11 +1,11 @@
 name: vcsgui
-version: 0.0.2
+version: 0.0.4
 cabal-version: >= 1.8
 build-type: Simple
 license: GPL
 license-file: LICENSE
 copyright: 2011 Stephan Fortelny, Harald Jagenteufel
-maintainer: stephanfortelny at gmail.com, h.jagenteufel at gmail.com
+maintainer: stephanfortelny at gmail.com, h.jagenteufel at gmail.com, hamish.k.mackenzie at gmail.com
 homepage: https://github.com/forste/haskellVCSGUI
 bug-reports: https://github.com/forste/haskellVCSGUI/issues
 synopsis: GUI library for source code management systems
@@ -15,7 +15,7 @@
     Uses vcswrapper to acces the scm functions.
     Currently git, SVN and mercurial (hg) are supported.
 category: Development
-author: Stephan Fortelny, Harald Jagenteufel
+author: Stephan Fortelny, Harald Jagenteufel, Hamish Mackenzie
 tested-with: GHC == 7.0
 data-files: LICENSE
             data/guiCommonCommit.glade
@@ -34,17 +34,18 @@
     default: True
 
 library
-    build-depends: MissingH >=1.1.0.3 && <1.3,
+    build-depends:
                filepath >=1.2.0.0 && < 1.4,
                base >=4.0.0.0 && <4.8,
                directory >=1.1.0.0 && <1.3,
                mtl >=2.0.1.0 && <2.2,
-               vcswrapper ==0.0.2,
+               vcswrapper ==0.0.4,
                process >=1.0.1.5 && <1.3
     if flag(gtk3)
-      build-depends: gtk3 >=0.12.4.1 && <0.13
+      build-depends: gtk3 >=0.12.4 && <0.13
+      cpp-options:   -DMIN_VERSION_gtk=MIN_VERSION_gtk3
     else
-      build-depends: gtk >=0.12.4.1 && <0.13
+      build-depends: gtk >=0.12.4 && <0.13
     exposed-modules: VCSGui.Common VCSGui.Git VCSGui.Svn VCSGui.Mercurial
     exposed: True
     buildable: True
@@ -63,17 +64,20 @@
 
 executable vcsgui
     main-is: Main.hs
-    build-depends: MissingH >=1.1.0.3 && <1.3,
+    build-depends:
                filepath >=1.2.0.0 && < 1.4,
                base >=4.0.0.0 && <4.8,
                directory >=1.1.0.0 && <1.3,
                mtl >=2.0.1.0 && <2.2,
-               vcswrapper ==0.0.2,
+               vcswrapper ==0.0.4,
                process >=1.0.1.5 && <1.3
     if flag(gtk3)
-      build-depends: gtk3 >=0.12.4.1 && <0.13
+      build-depends: gtk3 >=0.12.4 && <0.13
+      cpp-options:   -DMIN_VERSION_gtk=MIN_VERSION_gtk3
     else
-      build-depends: gtk >=0.12.4.1 && <0.13
+      build-depends: gtk >=0.12.4 && <0.13
+    if os(osx)
+        ghc-options: -optl-headerpad_max_install_names
     buildable: True
     hs-source-dirs: src
     other-modules: VCSGui.Svn.Helper VCSGui.Common.Process
@@ -89,17 +93,20 @@
 
 executable vcsgui-askpass
     main-is: Main.hs
-    build-depends: MissingH >=1.1.0.3 && <1.3,
+    build-depends:
                filepath >=1.2.0.0 && < 1.4,
                base >=4.0.0.0 && <4.8,
                directory >=1.1.0.0 && <1.3,
                mtl >=2.0.1.0 && <2.2,
-               vcswrapper ==0.0.2,
+               vcswrapper ==0.0.4,
                process >=1.0.1.5 && <1.3
     if flag(gtk3)
-      build-depends: gtk3 >=0.12.4.1 && <0.13
+      build-depends: gtk3 >=0.12.4 && <0.13
+      cpp-options:   -DMIN_VERSION_gtk=MIN_VERSION_gtk3
     else
-      build-depends: gtk >=0.12.4.1 && <0.13
+      build-depends: gtk >=0.12.4 && <0.13
+    if os(osx)
+        ghc-options: -optl-headerpad_max_install_names
     buildable: True
     hs-source-dirs: src/exe/askpass src
     other-modules: VCSGui.Svn.Helper VCSGui.Common.Process