diff --git a/VERSION b/VERSION
index 8cf93d31..6b038b34 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-05-28 13:04:49) dev
+Version 2.00.0 (2012-05-28 13:08:10) dev
diff --git a/applications/admin/controllers/mercurial.py b/applications/admin/controllers/mercurial.py
index a91b66a6..68921342 100644
--- a/applications/admin/controllers/mercurial.py
+++ b/applications/admin/controllers/mercurial.py
@@ -45,7 +45,7 @@ def commit():
                 INPUT(_type='submit',_value='Commit'))
     if form.accepts(request.vars,session):
         oldid = repo[repo.lookup('.')]
-        scmutil.addremove(repo)
+        addremove(repo)
         repo.commit(text=form.vars.comment)
         if repo[repo.lookup('.')] == oldid:
             response.flash = 'no changes'
diff --git a/applications/admin/models/0_imports.py b/applications/admin/models/0_imports.py
index ad01f129..0b3b4597 100644
--- a/applications/admin/models/0_imports.py
+++ b/applications/admin/models/0_imports.py
@@ -12,7 +12,11 @@ import socket
 from textwrap import dedent
 
 try:
-    from mercurial import ui, hg, cmdutil, scmutil
+    from mercurial import ui, hg, cmdutil
+    try:
+        from mercurial.scmutil import addremove
+    except:
+        from mercurial.cmdutil import addremove
     have_mercurial = True
 except ImportError:
     have_mercurial = False