diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy
index 2329581a23ec..0a789b4b9c13 100755
--- a/bin/nova-ajax-console-proxy
+++ b/bin/nova-ajax-console-proxy
@@ -24,7 +24,6 @@ from eventlet import greenthread
 from eventlet.green import urllib2
 
 import exceptions
-import gettext
 import os
 import sys
 import time
@@ -38,11 +37,11 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-gettext.install('nova', unicode=1)
 
 from nova import flags
 from nova import log as logging
 from nova import rpc
+from nova import service
 from nova import utils
 from nova import wsgi
 
@@ -141,5 +140,5 @@ if __name__ == '__main__':
     acp = AjaxConsoleProxy()
     acp.register_listeners()
     server = wsgi.Server("AJAX Console Proxy", acp, port=acp_port)
-    server.start()
-    server.wait()
+    service.serve(server)
+    service.wait()
diff --git a/bin/nova-api b/bin/nova-api
index d2086dc92717..38e2624d8cf5 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -26,7 +26,6 @@ Starts both the EC2 and OpenStack APIs in separate greenthreads.
 import eventlet
 eventlet.monkey_patch()
 
-import gettext
 import os
 import sys
 
@@ -36,7 +35,6 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
 if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
     sys.path.insert(0, possible_topdir)
 
-gettext.install('nova', unicode=1)
 
 from nova import flags
 from nova import log as logging
@@ -47,8 +45,8 @@ if __name__ == '__main__':
     utils.default_flagfile()
     flags.FLAGS(sys.argv)
     logging.setup()
-    services = []
+    servers = []
     for api in flags.FLAGS.enabled_apis:
-        services.append(service.WSGIService(api))
-    service.serve(*services)
+        servers.append(service.WSGIService(api))
+    service.serve(*servers)
     service.wait()
diff --git a/bin/nova-compute b/bin/nova-compute
index cd7c78def0ca..9aef201e6f77 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -22,7 +22,6 @@
 import eventlet
 eventlet.monkey_patch()
 
-import gettext
 import os
 import sys
 
@@ -34,7 +33,6 @@ POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
     sys.path.insert(0, POSSIBLE_TOPDIR)
 
-gettext.install('nova', unicode=1)
 
 from nova import flags
 from nova import log as logging
@@ -45,5 +43,6 @@ if __name__ == '__main__':
     utils.default_flagfile()
     flags.FLAGS(sys.argv)
     logging.setup()
-    service.serve()
+    server = service.Server(binary='nova-compute')
+    service.serve(server)
     service.wait()
diff --git a/bin/nova-console b/bin/nova-console
index 40608b995062..7f76fdc294d9 100755
--- a/bin/nova-console
+++ b/bin/nova-console
@@ -21,7 +21,6 @@
 import eventlet
 eventlet.monkey_patch()
 
-import gettext
 import os
 import sys
 
@@ -33,7 +32,6 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-gettext.install('nova', unicode=1)
 
 from nova import flags
 from nova import log as logging
@@ -44,5 +42,6 @@ if __name__ == '__main__':
     utils.default_flagfile()
     flags.FLAGS(sys.argv)
     logging.setup()
-    service.serve()
+    server = service.Server(binary='nova-console')
+    service.serve(server)
     service.wait()
diff --git a/bin/nova-direct-api b/bin/nova-direct-api
index c6cf9b2ff99c..106e89ba9eab 100755
--- a/bin/nova-direct-api
+++ b/bin/nova-direct-api
@@ -20,7 +20,9 @@
 
 """Starter script for Nova Direct API."""
 
-import gettext
+import eventlet
+eventlet.monkey_patch()
+
 import os
 import sys
 
@@ -32,12 +34,12 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-gettext.install('nova', unicode=1)
 
 from nova import compute
 from nova import flags
 from nova import log as logging
 from nova import network
+from nova import service
 from nova import utils
 from nova import volume
 from nova import wsgi
@@ -97,5 +99,6 @@ if __name__ == '__main__':
                          with_auth,
                          host=FLAGS.direct_host,
                          port=FLAGS.direct_port)
-    server.start()
-    server.wait()
+
+    service.serve(server)
+    service.wait()
diff --git a/bin/nova-network b/bin/nova-network
index 101761ef78b5..ce93e9354a69 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -22,7 +22,6 @@
 import eventlet
 eventlet.monkey_patch()
 
-import gettext
 import os
 import sys
 
@@ -34,7 +33,6 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-gettext.install('nova', unicode=1)
 
 from nova import flags
 from nova import log as logging
@@ -45,5 +43,6 @@ if __name__ == '__main__':
     utils.default_flagfile()
     flags.FLAGS(sys.argv)
     logging.setup()
-    service.serve()
+    server = service.Server(binary='nova-compute')
+    service.serve(server)
     service.wait()
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 4d5aec4450e6..c7a76e120d77 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -17,11 +17,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-"""
-  Daemon for nova objectstore. Supports S3 API.
-"""
+"""Daemon for nova objectstore. Supports S3 API."""
+
+import eventlet
+eventlet.monkey_patch()
 
-import gettext
 import os
 import sys
 
@@ -33,10 +33,10 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-gettext.install('nova', unicode=1)
 
 from nova import flags
 from nova import log as logging
+from nova import service
 from nova import utils
 from nova import wsgi
 from nova.objectstore import s3server
@@ -54,5 +54,5 @@ if __name__ == '__main__':
                          router,
                          port=FLAGS.s3_port,
                          host=FLAGS.s3_host)
-    server.start()
-    server.wait()
+    service.serve(server)
+    service.wait()
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index 0c205a80f377..07d1c55e6012 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -22,7 +22,6 @@
 import eventlet
 eventlet.monkey_patch()
 
-import gettext
 import os
 import sys
 
@@ -34,7 +33,6 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-gettext.install('nova', unicode=1)
 
 from nova import flags
 from nova import log as logging
@@ -45,5 +43,6 @@ if __name__ == '__main__':
     utils.default_flagfile()
     flags.FLAGS(sys.argv)
     logging.setup()
-    service.serve()
+    server = service.Server(binary='nova-compute')
+    service.serve(server)
     service.wait()
diff --git a/bin/nova-vncproxy b/bin/nova-vncproxy
index bdbb30a7fcf6..dc08e2433465 100755
--- a/bin/nova-vncproxy
+++ b/bin/nova-vncproxy
@@ -19,7 +19,8 @@
 """VNC Console Proxy Server."""
 
 import eventlet
-import gettext
+eventlet.monkey_patch()
+
 import os
 import sys
 
@@ -29,7 +30,6 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-gettext.install('nova', unicode=1)
 
 from nova import flags
 from nova import log as logging
@@ -41,7 +41,7 @@ from nova.vnc import auth
 from nova.vnc import proxy
 
 
-LOG = logging.getLogger('nova.vnc-proxy')
+LOG = logging.getLogger('nova.vncproxy')
 
 
 FLAGS = flags.FLAGS
@@ -81,7 +81,7 @@ if __name__ == "__main__":
     FLAGS(sys.argv)
     logging.setup()
 
-    LOG.audit(_("Starting nova-vnc-proxy node (version %s)"),
+    LOG.audit(_("Starting nova-vncproxy node (version %s)"),
               version.version_string_with_vcs())
 
     if not (os.path.exists(FLAGS.vncproxy_wwwroot) and
@@ -107,13 +107,10 @@ if __name__ == "__main__":
     else:
         with_auth = auth.VNCNovaAuthMiddleware(with_logging)
 
-    service.serve()
-
     server = wsgi.Server("VNC Proxy",
                          with_auth,
                          host=FLAGS.vncproxy_host,
                          port=FLAGS.vncproxy_port)
-    server.start()
     server.start_tcp(handle_flash_socket_policy, 843, host=FLAGS.vncproxy_host)
-
-    server.wait()
+    service.serve(server)
+    service.wait()
diff --git a/bin/nova-volume b/bin/nova-volume
index 8dcdbc500e76..1451de44a2e1 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -22,7 +22,6 @@
 import eventlet
 eventlet.monkey_patch()
 
-import gettext
 import os
 import sys
 
@@ -34,7 +33,6 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-gettext.install('nova', unicode=1)
 
 from nova import flags
 from nova import log as logging
@@ -45,5 +43,6 @@ if __name__ == '__main__':
     utils.default_flagfile()
     flags.FLAGS(sys.argv)
     logging.setup()
-    service.serve()
+    server = service.Server(binary='nova-volume')
+    service.serve(server)
     service.wait()