diff --git a/Makefile b/Makefile
index 40460de7a..72d916965 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ predepend:
 	touch predepend
 
 $(BUILD_DIR)/exmachina: build
-	git clone git://github.com/bnewbold/exmachina $(BUILD_DIR)/exmachina
+	git clone git://github.com/tomgalloway/exmachina $(BUILD_DIR)/exmachina
 
 $(BUILD_DIR)/bjsonrpc: build
 	git clone git://github.com/deavid/bjsonrpc.git $(BUILD_DIR)/bjsonrpc
diff --git a/modules/installed/system/config.py b/modules/installed/system/config.py
index 01c4ec693..b671fcc12 100644
--- a/modules/installed/system/config.py
+++ b/modules/installed/system/config.py
@@ -10,6 +10,7 @@ import cfg
 from forms import Form
 from model import User
 from util import *
+import platform
 
 class Config(PagePlugin):
     def __init__(self, *args, **kwargs):
@@ -49,7 +50,10 @@ def set_hostname(hostname):
         # don't persist/cache change unless it was saved successfuly
         sys_store = filedict_con(cfg.store_file, 'sys')
         sys_store['hostname'] = hostname
-        cfg.exmachina.initd.restart("hostname.sh") # is hostname.sh debian-only?
+        if platform.linux_distribution()[0]=="Ubuntu" :
+            cfg.exmachina.service.start("hostname")
+        else:
+            cfg.exmachina.initd.restart("hostname.sh") # is hostname.sh debian-only?
     except OSError, e:
         raise cherrypy.HTTPError(500, "Hostname restart failed: %s" % e)