diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -21,6 +21,8 @@
 
 And that's it!
 
+On [Windows](http://hackage.haskell.org/package/fltkhs-0.5.1.6/docs/Graphics-UI-FLTK-LowLevel-FLTKHS.html#g:8) it is only slightly more complicated because packages like `autotools` and `tar` are not available by default.
+
 The second fastest way is to compile FLTK from source yourself. For instructions please see the documentation for [Linux](http://hackage.haskell.org/package/fltkhs/docs/Graphics-UI-FLTK-LowLevel-FLTKHS.html#g:10), [OSX](http://hackage.haskell.org/package/fltkhs/docs/Graphics-UI-FLTK-LowLevel-FLTKHS.html#g:11), [Windows](http://hackage.haskell.org/package/fltkhs/docs/Graphics-UI-FLTK-LowLevel-FLTKHS.html#g:12).
 
 ### Windows
diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -81,12 +81,13 @@
         Windows -> do
           rawSystemExit normal "sh" ([(fltkDir </> "configure")] ++ fltkFlags)
           runMake
-          updateEnv "INCLUDE_PATH" fltkDir
-          updateEnv "LD_LIBRARY_PATH" (fltkDir </> "lib")
-          updateEnv "LD_LIBRARY_PATH" (fltkDir </> "src")
-          updateEnv "LIBRARY_PATH" (fltkDir </> "lib")
-          updateEnv "PATH" (fltkDir </> "fluid")
-          updateEnv "PATH" fltkDir
+          let path = windowsFriendlyPaths fltkDir
+          updateEnv "INCLUDE_PATH" path
+          updateEnv "LD_LIBRARY_PATH" (path </> "lib")
+          updateEnv "LD_LIBRARY_PATH" (path </> "src")
+          updateEnv "LIBRARY_PATH" (path </> "lib")
+          updateEnv "PATH" (path </> "fluid")
+          updateEnv "PATH" path
         _ -> do
           rawSystemExit normal (fltkDir </> "configure") fltkFlags
           runMake
@@ -164,13 +165,16 @@
   else s
 
 myBuildHook pkg_descr local_bld_info user_hooks bld_flags =
-  do let compileC = do
-             putStrLn "==Compiling C bindings=="
-             case buildOS of
-              Windows -> rawSystemExit normal "make" []
-              os | os `elem` [FreeBSD, OpenBSD, NetBSD, DragonFly]
-                -> rawSystemExit normal "gmake" []
-              _ -> rawSystemExit normal "make" []
+  do case buildOS of
+       Windows ->
+         if (flagIsSet (FlagName "bundled") (configFlags local_bld_info))
+         then do
+           projectRoot <- getCurrentDirectory
+           let fltkDir = projectRoot </> fltkSource
+           updateEnv "PATH" (windowsFriendlyPaths fltkDir)
+         else return ()
+       _ -> return ()
+     let compileC = putStrLn "==Compiling C bindings==" >> runMake
      cdirexists <- doesDirectoryExist fltkcdir
      if cdirexists
        then
diff --git a/fltkhs.cabal b/fltkhs.cabal
--- a/fltkhs.cabal
+++ b/fltkhs.cabal
@@ -1,5 +1,5 @@
 name : fltkhs
-version : 0.5.1.6
+version : 0.5.1.7
 synopsis : FLTK bindings
 description:
     Low level bindings for the FLTK GUI toolkit. For installation and quick start instruction please scroll all the way down to the README.