diff --git a/snap-core.cabal b/snap-core.cabal
--- a/snap-core.cabal
+++ b/snap-core.cabal
@@ -1,5 +1,5 @@
 name:           snap-core
-version:        0.9.7.0
+version:        0.9.7.2
 synopsis:       Snap: A Haskell Web Framework (core interfaces and types)
 
 description:
@@ -93,11 +93,12 @@
 
   if flag(portable) || os(windows)
     cpp-options: -DPORTABLE
-    build-depends: old-locale >= 1 && <2
+    build-depends: time-locale-compat == 0.1.*
   else
     c-sources: cbits/timefuncs.c
     include-dirs: cbits
     build-depends: bytestring-mmap >= 0.2.2 && <0.3,
+                   old-locale >= 1 && <2,
                    unix >= 2.4 && <3.0
     cpp-options: -DUSE_UNIX
 
@@ -129,7 +130,7 @@
 
 
   build-depends:
-    attoparsec                >= 0.10    && < 0.13,
+    attoparsec                >= 0.10    && < 0.14,
     attoparsec-enumerator     >= 0.3     && < 0.4,
     base                      >= 4       && < 5,
     blaze-builder             >= 0.2.1.4 && < 0.5,
diff --git a/src/Snap/Internal/Http/Types.hs b/src/Snap/Internal/Http/Types.hs
--- a/src/Snap/Internal/Http/Types.hs
+++ b/src/Snap/Internal/Http/Types.hs
@@ -43,7 +43,7 @@
 import           Data.Time.Format
 import           Data.Time.LocalTime
 import           Data.Time.Clock.POSIX
-import           System.Locale (defaultTimeLocale)
+import           Data.Time.Locale.Compat (defaultTimeLocale)
 #else
 import           Data.Time.Format ()
 import           Foreign
diff --git a/src/Snap/Internal/Parsing.hs b/src/Snap/Internal/Parsing.hs
--- a/src/Snap/Internal/Parsing.hs
+++ b/src/Snap/Internal/Parsing.hs
@@ -354,9 +354,9 @@
 urlEncodeTable :: FastSet
 urlEncodeTable = generateFS f
   where
-    f c = any ($ (w2c c)) [isAlphaNum, flip elem [ '$', '_', '-', '.', '!'
-                                                 , '*' , '\'', '(', ')'
-                                                 , ',' ] ]
+    f c = any ($ (w2c c)) [\x -> isAscii x && isAlphaNum x,
+                          flip elem [ '$', '_', '-', '.', '!'
+                                    , '*' , '\'', '(', ')', ',' ] ]
 
 ------------------------------------------------------------------------------
 hexd :: Char -> Builder