diff --git a/Clckwrks/Server.hs b/Clckwrks/Server.hs
--- a/Clckwrks/Server.hs
+++ b/Clckwrks/Server.hs
@@ -26,7 +26,6 @@
 import Happstack.Auth               (handleAuthProfile)
 import Happstack.Server.FileServe.BuildingBlocks (guessContentTypeM, isSafePath, serveFile)
 import Happstack.Server.SimpleHTTPS (TLSConf(..), nullTLSConf, simpleHTTPS)
-import Network.URI                  (unEscapeString)
 import System.FilePath              ((</>), makeRelative, splitDirectories)
 import Web.Routes.Happstack         (implSite)
 import Web.Plugins.Core             (Plugins, withPlugins, getPluginRouteFn, getPostHooks, serve)
diff --git a/clckwrks.cabal b/clckwrks.cabal
--- a/clckwrks.cabal
+++ b/clckwrks.cabal
@@ -1,5 +1,5 @@
 Name:                clckwrks
-Version:             0.22.3
+Version:             0.22.4
 Synopsis:            A secure, reliable content management system (CMS) and blogging platform
 Description:         clckwrks (pronounced, clockworks) aims to compete
                      directly with popular PHP-based blogging and CMS
@@ -28,6 +28,10 @@
     type:     git
     location: git://github.com/clckwrks/clckwrks.git
 
+flag network-uri
+    description: Get Network.URI from the network-uri package
+    default: True
+
 Library
   Build-tools:     hsx2hs
   Exposed-modules: Clckwrks
@@ -66,6 +70,12 @@
   if !os(darwin)
       Extra-Libraries: cryptopp
 
+  if flag(network-uri)
+     build-depends:               network > 2.6      && < 2.7,
+                                  network-uri >= 2.6 && < 2.7
+  else
+     build-depends:               network < 2.6
+
   Build-depends:
      acid-state                   >= 0.12 && < 0.13,
      aeson                        >= 0.5 && < 0.9,
@@ -86,7 +96,6 @@
      ixset                        == 1.0.*,
      jmacro                       == 0.6.*,
      mtl                          >= 2.0 && < 2.3,
-     network                      >= 2.3 && < 2.6,
      old-locale                   ==  1.0.*,
      process                      >= 1.0 && < 1.3,
 --     plugins-auto == 0.0.1.1,