diff --git a/INSTALL b/INSTALL
index a8d6138d..19b7d4e4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,7 @@
 Install the python-cheetah package, pandoc, python-augeas, and
 bjsonrpc:
 
-apt-get install python-cheetah pandoc python-augeas python-bjsonrpc python-cherrypy3 python-simplejson
+apt-get install python-cheetah pandoc python-augeas python-bjsonrpc python-cherrypy3
 
 Unzip and untar the source into a directory.  Change to the directory
 containing the program. Run:
diff --git a/Makefile b/Makefile
index cf29a63a..b2127165 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ default: predepend config dirs template css docs dbs
 all: default
 
 predepend:
-	sudo sh -c "apt-get install augeas-tools python-bjsonrpc python-augeas python-simplejson pandoc python-cheetah python-cherrypy3"
+	sudo sh -c "apt-get install augeas-tools python-bjsonrpc python-augeas pandoc python-cheetah python-cherrypy3"
 	git submodule init
 	git submodule update
 	touch predepend
diff --git a/fabfile.py b/fabfile.py
index 4b4d2541..d8654463 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -7,6 +7,11 @@
 # plinth box
 
 import os,sys, subprocess
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
+
 import simplejson as json
 import fabric.api
 from fabric.api import local, env, cd, put, get, task
diff --git a/filedict.py b/filedict.py
index 1e76d67d..8dee531f 100644
--- a/filedict.py
+++ b/filedict.py
@@ -5,7 +5,12 @@
 Date  : 31-May-2009
 """
 
-import simplejson as json ## jlv replaced pickle with json
+import sys
+## jlv replaced pickle with json
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
  
 import UserDict
 ##import cPickle as pickle
diff --git a/menu.py b/menu.py
index 79f22053..5d6ea248 100644
--- a/menu.py
+++ b/menu.py
@@ -1,4 +1,9 @@
-import simplejson as json
+
+import sys
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
 from urlparse import urlparse
 import cherrypy
 import cfg
diff --git a/modules/installed/lib/user_store.py b/modules/installed/lib/user_store.py
index 236b73a8..5471bb1d 100644
--- a/modules/installed/lib/user_store.py
+++ b/modules/installed/lib/user_store.py
@@ -1,5 +1,9 @@
 import os
-import simplejson as json
+import sys
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
 import cherrypy
 import cfg
 from model import User
diff --git a/modules/installed/santiago/santiago.py b/modules/installed/santiago/santiago.py
index 7cf11e53..dba48994 100644
--- a/modules/installed/santiago/santiago.py
+++ b/modules/installed/santiago/santiago.py
@@ -7,7 +7,10 @@
 
 import os, sys
 import cherrypy
-import simplejson as json
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
 from gettext import gettext as _
 from plugin_mount import PagePlugin
 from modules.auth import require
diff --git a/modules/installed/system/config.py b/modules/installed/system/config.py
index b671fcc1..d4b2b53e 100644
--- a/modules/installed/system/config.py
+++ b/modules/installed/system/config.py
@@ -1,7 +1,11 @@
 import os, subprocess
 from socket import gethostname
 import cherrypy
-import simplejson as json
+import sys
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
 from gettext import gettext as _
 from filedict import FileDict
 from modules.auth import require
diff --git a/modules/installed/system/expert_mode.py b/modules/installed/system/expert_mode.py
index da8dbc5a..9bad7915 100644
--- a/modules/installed/system/expert_mode.py
+++ b/modules/installed/system/expert_mode.py
@@ -1,6 +1,10 @@
 import os
 import cherrypy
-import simplejson as json
+import sys
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
 from gettext import gettext as _
 from filedict import FileDict
 from modules.auth import require
diff --git a/modules/installed/system/system.py b/modules/installed/system/system.py
index 68a7a50f..6871f2e1 100644
--- a/modules/installed/system/system.py
+++ b/modules/installed/system/system.py
@@ -1,6 +1,10 @@
 import os
 import cherrypy
-import simplejson as json
+import sys
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
 from gettext import gettext as _
 from filedict import FileDict
 from auth import require
diff --git a/modules/installed/system/wan.py b/modules/installed/system/wan.py
index 0817f62c..a34317c0 100644
--- a/modules/installed/system/wan.py
+++ b/modules/installed/system/wan.py
@@ -1,6 +1,10 @@
 import os
 import cherrypy
-import simplejson as json
+import sys
+if sys.version_info >= (2, 6):
+    import json
+else:
+    import simplejson as json
 from gettext import gettext as _
 from filedict import FileDict
 from modules.auth import require
diff --git a/vendor/withsqlite b/vendor/withsqlite
index bbfdd188..78b7bc9c 160000
--- a/vendor/withsqlite
+++ b/vendor/withsqlite
@@ -1 +1 @@
-Subproject commit bbfdd188597bd55809ca58a46d42f1ef1afdbf69
+Subproject commit 78b7bc9c2264a228ea22309522ca5aefbc377490