diff --git a/sagemath-sagenb.patch b/sagemath-sagenb.patch
index e1c4a49..435c01a 100644
--- a/sagemath-sagenb.patch
+++ b/sagemath-sagenb.patch
@@ -1,6 +1,47 @@
+diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/flask_version/base.py.orig build/pkgs/sagenb/src/sagenb-0.10.8.2/flask_version/base.py
+--- build/pkgs/sagenb/src/sagenb-0.10.8.2/flask_version/base.py.orig	2014-02-11 18:13:34.453086409 -0200
++++ build/pkgs/sagenb/src/sagenb-0.10.8.2/flask_version/base.py	2014-02-11 18:14:30.976088573 -0200
+@@ -4,8 +4,6 @@ from functools import partial
+ from flask import Flask, Module, url_for, render_template, request, session, redirect, g, make_response, current_app
+ from decorators import login_required, guest_or_login_required, with_lock
+ from decorators import global_lock
+-# Make flask use the old session foo from <=flask-0.9
+-from flask_oldsessions import OldSecureCookieSessionInterface
+ 
+ from flask.ext.autoindex import AutoIndex
+ try:
+@@ -25,7 +23,6 @@ class SageNBFlask(Flask):
+     def __init__(self, *args, **kwds):
+         self.startup_token = kwds.pop('startup_token', None)
+         Flask.__init__(self, *args, **kwds)
+-        self.session_interface = OldSecureCookieSessionInterface()
+ 
+         self.config['SESSION_COOKIE_HTTPONLY'] = False
+ 
+@@ -36,7 +33,7 @@ class SageNBFlask(Flask):
+         self.add_static_path('/javascript', DATA)
+         self.add_static_path('/static', DATA)
+         self.add_static_path('/java', DATA)
+-        self.add_static_path('/java/jmol', os.path.join(os.environ["SAGE_ROOT"],"local","share","jmol"))
++        self.add_static_path('/java/jmol', os.path.join(DATA, "jmol"))
+         import mimetypes
+         mimetypes.add_type('text/plain','.jmol')
+ 
+diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/html/notebook/base.html.orig build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/html/notebook/base.html
+--- build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/html/notebook/base.html.orig	2014-02-11 18:13:34.468086409 -0200
++++ build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/html/notebook/base.html	2014-02-11 18:13:51.591087065 -0200
+@@ -46,7 +46,7 @@ INPUT:
+ <!-- Jmol - embedded 3D graphics -->
+ <script type="text/javascript" src="/java/jmol/appletweb/Jmol.js"></script>
+ <!-- This must stay in head -->
+-<script>jmolInitialize("/java/jmol");jmolSetCallback("menuFile","/java/jmol/appletweb/SageMenu.mnu");</script>
++<script>jmolInitialize("/java/jmol", "JmolApplet.jar,vecmath.jar");</script>
+ 
+ {% if JEDITABLE_TINYMCE and not worksheet.docbrowser() and not worksheet.is_published() %}
+ <!-- TinyMCE and jEditable - in-place editing of text cells -->
 diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/js/jmol_lib.js.orig build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/js/jmol_lib.js
---- build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/js/jmol_lib.js.orig	2014-02-07 11:38:58.311706343 -0200
-+++ build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/js/jmol_lib.js	2014-02-07 11:39:29.199707525 -0200
+--- build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/js/jmol_lib.js.orig	2014-02-11 18:13:34.422086407 -0200
++++ build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/js/jmol_lib.js	2014-02-11 18:13:51.576087064 -0200
 @@ -256,9 +256,6 @@ function makeCntrlPanels(url, n, functio
      panelHTML +='<button title="Move to own window" onClick="javascript:void(jmol_popup(\''+n+'\'))">Move to own window</button> arbitrarily resizable.<hr/>';
      //static image to save
@@ -12,9 +53,26 @@ diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/js/jmol_lib.js.o
      panelHTML +='<input class="worksheet" type="checkbox" value="spin on" onchange="jmol_spin(this.checked,'+n+');" title="Enable/disable spin"/>Spin on';
      //antialaisdisplay (smoothing of objects)
 diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/flask_version/base.py.orig build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/flask_version/base.py
---- build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/flask_version/base.py.orig	2014-02-07 11:36:58.944701772 -0200
-+++ build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/flask_version/base.py	2014-02-07 11:37:17.228702472 -0200
-@@ -36,7 +36,7 @@ class SageNBFlask(Flask):
+--- build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/flask_version/base.py.orig	2014-02-11 18:13:34.459086409 -0200
++++ build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/flask_version/base.py	2014-02-11 18:13:51.590087065 -0200
+@@ -4,8 +4,6 @@ from functools import partial
+ from flask import Flask, Module, url_for, render_template, request, session, redirect, g, make_response, current_app
+ from decorators import login_required, guest_or_login_required, with_lock
+ from decorators import global_lock
+-# Make flask use the old session foo from <=flask-0.9
+-from flask_oldsessions import OldSecureCookieSessionInterface
+ 
+ from flask.ext.autoindex import AutoIndex
+ try:
+@@ -25,7 +23,6 @@ class SageNBFlask(Flask):
+     def __init__(self, *args, **kwds):
+         self.startup_token = kwds.pop('startup_token', None)
+         Flask.__init__(self, *args, **kwds)
+-        self.session_interface = OldSecureCookieSessionInterface()
+ 
+         self.config['SESSION_COOKIE_HTTPONLY'] = False
+ 
+@@ -36,7 +33,7 @@ class SageNBFlask(Flask):
          self.add_static_path('/javascript', DATA)
          self.add_static_path('/static', DATA)
          self.add_static_path('/java', DATA)
@@ -24,8 +82,8 @@ diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/flask_version/base.py.orig
          mimetypes.add_type('text/plain','.jmol')
  
 diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/notebook/cell.py.orig build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/notebook/cell.py
---- build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/notebook/cell.py.orig	2014-02-07 11:39:52.674708424 -0200
-+++ build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/notebook/cell.py	2014-02-07 11:40:46.407710482 -0200
+--- build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/notebook/cell.py.orig	2014-02-11 18:13:34.441086408 -0200
++++ build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/notebook/cell.py	2014-02-11 18:13:51.583087065 -0200
 @@ -2369,7 +2369,7 @@ class Cell(Cell_generic):
                      jmol_script = jmol_file.read()
                      jmol_file.close()
@@ -36,8 +94,8 @@ diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/notebook/cell.py.orig buil
                      jmol_file = open(jmol_name, 'w')
                      jmol_file.write(jmol_script)
 diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/notebook/run_notebook.py.orig build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/notebook/run_notebook.py
---- build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/notebook/run_notebook.py.orig	2014-02-07 11:41:06.343711245 -0200
-+++ build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/notebook/run_notebook.py	2014-02-07 11:41:54.694713097 -0200
+--- build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/notebook/run_notebook.py.orig	2014-02-11 18:13:34.447086408 -0200
++++ build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/notebook/run_notebook.py	2014-02-11 18:13:51.586087065 -0200
 @@ -46,12 +46,14 @@ sagenb.notebook.misc.DIR = %(cwd)r #We s
  # Flask #
  #########
@@ -55,55 +113,3 @@ diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/notebook/run_notebook.py.o
  
  def save_notebook(notebook):
      print "Quitting all running worksheets..."
-diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/flask_version/base.py.orig build/pkgs/sagenb/src/sagenb-0.10.8.2/flask_version/base.py
---- build/pkgs/sagenb/src/sagenb-0.10.8.2/flask_version/base.py.orig	2014-02-08 12:08:41.638029141 -0200
-+++ build/pkgs/sagenb/src/sagenb-0.10.8.2/flask_version/base.py	2014-02-08 12:09:17.574030517 -0200
-@@ -4,8 +4,6 @@ from functools import partial
- from flask import Flask, Module, url_for, render_template, request, session, redirect, g, make_response, current_app
- from decorators import login_required, guest_or_login_required, with_lock
- from decorators import global_lock
--# Make flask use the old session foo from <=flask-0.9
--from flask_oldsessions import OldSecureCookieSessionInterface
- 
- from flask.ext.autoindex import AutoIndex
- try:
-@@ -25,7 +23,6 @@ class SageNBFlask(Flask):
-     def __init__(self, *args, **kwds):
-         self.startup_token = kwds.pop('startup_token', None)
-         Flask.__init__(self, *args, **kwds)
--        self.session_interface = OldSecureCookieSessionInterface()
- 
-         self.config['SESSION_COOKIE_HTTPONLY'] = False
- 
-diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/flask_version/base.py.orig build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/flask_version/base.py
---- build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/flask_version/base.py.orig	2014-02-08 12:08:50.364029475 -0200
-+++ build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/flask_version/base.py	2014-02-08 12:09:10.271030238 -0200
-@@ -4,8 +4,6 @@ from functools import partial
- from flask import Flask, Module, url_for, render_template, request, session, redirect, g, make_response, current_app
- from decorators import login_required, guest_or_login_required, with_lock
- from decorators import global_lock
--# Make flask use the old session foo from <=flask-0.9
--from flask_oldsessions import OldSecureCookieSessionInterface
- 
- from flask.ext.autoindex import AutoIndex
- try:
-@@ -25,7 +23,6 @@ class SageNBFlask(Flask):
-     def __init__(self, *args, **kwds):
-         self.startup_token = kwds.pop('startup_token', None)
-         Flask.__init__(self, *args, **kwds)
--        self.session_interface = OldSecureCookieSessionInterface()
- 
-         self.config['SESSION_COOKIE_HTTPONLY'] = False
- 
-diff -up build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/html/notebook/base.html.orig build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/html/notebook/base.html
---- build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/html/notebook/base.html.orig	2013-12-25 11:38:29.000000000 -0200
-+++ build/pkgs/sagenb/src/sagenb-0.10.8.2/sagenb/data/sage/html/notebook/base.html	2014-02-08 15:22:29.290474404 -0200
-@@ -46,7 +46,7 @@ INPUT:
- <!-- Jmol - embedded 3D graphics -->
- <script type="text/javascript" src="/java/jmol/appletweb/Jmol.js"></script>
- <!-- This must stay in head -->
--<script>jmolInitialize("/java/jmol");jmolSetCallback("menuFile","/java/jmol/appletweb/SageMenu.mnu");</script>
-+<script>jmolInitialize("/java/jmol", "JmolApplet.jar,vecmath.jar");</script>
- 
- {% if JEDITABLE_TINYMCE and not worksheet.docbrowser() and not worksheet.is_published() %}
- <!-- TinyMCE and jEditable - in-place editing of text cells -->